stream.place
Live video on the AT Protocol
rename: streamplace
See merge request streamplace/streamplace!84
Changelog: feature
authored by
Eli Mallon
and committed by
Eli Streams
5f21a2eb
f4be6602
+1
-1
.ci/dockerfile-hash.yaml
+1
-1
.ci/dockerfile-hash.yaml
+12
-12
.gitlab-ci.yml
+12
-12
.gitlab-ci.yml
···
73
script:
74
- /kaniko/executor
75
--build-arg TARGETARCH=amd64
76
-
--build-arg AQUAREUM_URL=$AQUAREUM_URL_LINUX_AMD64
77
--context "${CI_PROJECT_DIR}"
78
--dockerfile "${CI_PROJECT_DIR}/docker/release.Dockerfile"
79
-
--destination "$CI_REGISTRY_IMAGE:$AQUAREUM_BRANCH-amd64"
80
-
--destination "$CI_REGISTRY_IMAGE:$AQUAREUM_VERSION-amd64"
81
82
build-docker-arm64:
83
stage: build
···
92
script:
93
- /kaniko/executor
94
--build-arg TARGETARCH=arm64
95
-
--build-arg AQUAREUM_URL=$AQUAREUM_URL_LINUX_ARM64
96
--context "${CI_PROJECT_DIR}"
97
--dockerfile "${CI_PROJECT_DIR}/docker/release.Dockerfile"
98
-
--destination "$CI_REGISTRY_IMAGE:$AQUAREUM_BRANCH-arm64"
99
-
--destination "$CI_REGISTRY_IMAGE:$AQUAREUM_VERSION-arm64"
100
--customPlatform=linux/arm64
101
102
build-docker-manifest:
···
118
script:
119
- ./manifest-tool --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" push from-args
120
--platforms linux/amd64,linux/arm64
121
-
--template $CI_REGISTRY_IMAGE:$AQUAREUM_VERSION-ARCH
122
-
--tags $AQUAREUM_BRANCH
123
-
--target $CI_REGISTRY_IMAGE:$AQUAREUM_VERSION
124
125
build-android:
126
stage: build
···
142
# workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/501457
143
# which is a workaround for ios builds failing due to /tmp vs /private/tmp weirdness
144
- cd ..
145
-
- mv aquareum /Users/admin/aquareum
146
-
- cd /Users/admin/aquareum
147
- git fetch --unshallow || echo 'already unshallow'
148
- brew install ninja go openssl@3 && go version
149
- sudo gem uninstall xcodeproj -x --ignore-dependencies
···
175
MSYSTEM: "MINGW32"
176
CHERE_INVOKING: "yes"
177
script:
178
-
- C:\msys64\usr\bin\bash -lc "bash -x ./util/windows-selftest.sh $AQUAREUM_DESKTOP_URL_WINDOWS_AMD64"
179
180
release:
181
stage: build
···
73
script:
74
- /kaniko/executor
75
--build-arg TARGETARCH=amd64
76
+
--build-arg STREAMPLACE_URL=$STREAMPLACE_URL_LINUX_AMD64
77
--context "${CI_PROJECT_DIR}"
78
--dockerfile "${CI_PROJECT_DIR}/docker/release.Dockerfile"
79
+
--destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_BRANCH-amd64"
80
+
--destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION-amd64"
81
82
build-docker-arm64:
83
stage: build
···
92
script:
93
- /kaniko/executor
94
--build-arg TARGETARCH=arm64
95
+
--build-arg STREAMPLACE_URL=$STREAMPLACE_URL_LINUX_ARM64
96
--context "${CI_PROJECT_DIR}"
97
--dockerfile "${CI_PROJECT_DIR}/docker/release.Dockerfile"
98
+
--destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_BRANCH-arm64"
99
+
--destination "$CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION-arm64"
100
--customPlatform=linux/arm64
101
102
build-docker-manifest:
···
118
script:
119
- ./manifest-tool --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" push from-args
120
--platforms linux/amd64,linux/arm64
121
+
--template $CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION-ARCH
122
+
--tags $STREAMPLACE_BRANCH
123
+
--target $CI_REGISTRY_IMAGE:$STREAMPLACE_VERSION
124
125
build-android:
126
stage: build
···
142
# workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/501457
143
# which is a workaround for ios builds failing due to /tmp vs /private/tmp weirdness
144
- cd ..
145
+
- mv streamplace /Users/admin/streamplace
146
+
- cd /Users/admin/streamplace
147
- git fetch --unshallow || echo 'already unshallow'
148
- brew install ninja go openssl@3 && go version
149
- sudo gem uninstall xcodeproj -x --ignore-dependencies
···
175
MSYSTEM: "MINGW32"
176
CHERE_INVOKING: "yes"
177
script:
178
+
- C:\msys64\usr\bin\bash -lc "bash -x ./util/windows-selftest.sh $STREAMPLACE_DESKTOP_URL_WINDOWS_AMD64"
179
180
release:
181
stage: build
+1
-1
.vscode/settings.json
+1
-1
.vscode/settings.json
+1
-1
LICENSE
+1
-1
LICENSE
+55
-55
Makefile
+55
-55
Makefile
···
40
.PHONY: node
41
node: schema
42
$(MAKE) meson-setup
43
-
meson compile -C $(BUILDDIR) aquareum
44
45
.PHONY: schema
46
schema:
···
55
LINUX_LINK_COUNT=5
56
.PHONY: link-test-linux
57
link-test-linux:
58
-
count=$(shell ldd ./build-linux-amd64/aquareum | wc -l) \
59
&& echo $$count \
60
&& if [ "$$count" != "$(LINUX_LINK_COUNT)" ]; then echo "ldd reports new libaries linked! want $(LINUX_LINK_COUNT) got $$count" \
61
-
&& ldd ./build-linux-amd64/aquareum \
62
&& exit 1; \
63
fi
64
65
MACOS_LINK_COUNT=10
66
.PHONY: link-test-macos
67
link-test-macos:
68
-
count=$(shell otool -L ./build-darwin-arm64/aquareum | wc -l | xargs) \
69
&& echo $$count \
70
&& if [ "$$count" != "$(MACOS_LINK_COUNT)" ]; then echo "otool -L reports new libaries linked! want $(MACOS_LINK_COUNT) got $$count" \
71
-
&& otool -L ./build-darwin-arm64/aquareum \
72
&& exit 1; \
73
fi
74
75
WINDOWS_LINK_COUNT=16
76
.PHONY: link-test-windows
77
link-test-windows:
78
-
count=$(shell x86_64-w64-mingw32-objdump -p ./build-windows-amd64/aquareum.exe | grep "DLL Name" | wc -l | xargs) \
79
&& echo $$count \
80
&& if [ "$$count" != "$(WINDOWS_LINK_COUNT)" ]; then echo "x86_64-w64-mingw32-objdump -p reports new libaries linked! want $(WINDOWS_LINK_COUNT) got $$count" \
81
-
&& x86_64-w64-mingw32-objdump -p ./build-windows-amd64/aquareum.exe | grep "DLL Name" \
82
&& exit 1; \
83
fi
84
···
106
&& ./gradlew :app:bundleRelease \
107
&& ./gradlew :app:bundleDebug \
108
&& cd - \
109
-
&& mv ./js/app/android/app/build/outputs/bundle/release/app-release.aab ./bin/aquareum-$(VERSION)-android-release.aab \
110
-
&& mv ./js/app/android/app/build/outputs/bundle/debug/app-debug.aab ./bin/aquareum-$(VERSION)-android-debug.aab \
111
&& cd bin \
112
-
&& java -jar ../.build/bundletool.jar build-apks --ks ../my-release-key.keystore --ks-key-alias alias_name --ks-pass pass:aquareum --bundle=aquareum-$(VERSION)-android-release.aab --output=aquareum-$(VERSION)-android-release.apks --mode=universal \
113
-
&& java -jar ../.build/bundletool.jar build-apks --ks ../my-release-key.keystore --ks-key-alias alias_name --ks-pass pass:aquareum --bundle=aquareum-$(VERSION)-android-debug.aab --output=aquareum-$(VERSION)-android-debug.apks --mode=universal \
114
-
&& unzip aquareum-$(VERSION)-android-release.apks && mv universal.apk aquareum-$(VERSION)-android-release.apk && rm toc.pb \
115
-
&& unzip aquareum-$(VERSION)-android-debug.apks && mv universal.apk aquareum-$(VERSION)-android-debug.apk && rm toc.pb
116
117
.PHONY: ios
118
ios: app
119
xcodebuild \
120
-
-workspace ./js/app/ios/Aquareum.xcworkspace \
121
-sdk iphoneos \
122
-configuration Release \
123
-
-scheme Aquareum \
124
-
-archivePath ./bin/aquareum-$(VERSION)-ios-release.xcarchive \
125
CODE_SIGN_IDENTITY=- \
126
AD_HOC_CODE_SIGNING_ALLOWED=YES \
127
CODE_SIGN_STYLE=Automatic \
128
DEVELOPMENT_TEAM=ZZZZZZZZZZ \
129
clean archive | xcpretty \
130
&& cd bin \
131
-
&& tar -czvf aquareum-$(VERSION)-ios-release.xcarchive.tar.gz aquareum-$(VERSION)-ios-release.xcarchive
132
133
-
# xcodebuild -exportArchive -archivePath ./bin/aquareum-$(VERSION)-ios-release.xcarchive -exportOptionsPlist ./js/app/exportOptions.plist -exportPath ./bin/aquareum-$(VERSION)-ios-release.ipa
134
135
.build/bundletool.jar:
136
mkdir -p .build \
···
199
&& yarn run make --platform linux --arch x64 \
200
&& yarn run make --platform linux --arch arm64 \
201
&& cd - \
202
-
&& mv "js/desktop/out/make/AppImage/x64/Aquareum-$(VERSION_ELECTRON)-x64.AppImage" ./bin/aquareum-desktop-$(VERSION)-linux-amd64.AppImage \
203
-
&& mv "js/desktop/out/make/AppImage/arm64/Aquareum-$(VERSION_ELECTRON)-arm64.AppImage" ./bin/aquareum-desktop-$(VERSION)-linux-arm64.AppImage
204
205
.PHONY: desktop-windows
206
desktop-windows:
207
cd js/desktop \
208
&& yarn run make --platform win32 --arch x64 \
209
&& cd - \
210
-
&& export SUM=$$(cat ./js/desktop/out/make/squirrel.windows/x64/aquareum_desktop-$(VERSION_ELECTRON)-full.nupkg | openssl sha1 | awk '{ print $$2 }') \
211
-
&& echo $$SUM > ./bin/aquareum-desktop-$(VERSION)-windows-amd64.nupkg.sha1 \
212
-
&& mv "js/desktop/out/make/squirrel.windows/x64/aquareum_desktop-$(VERSION_ELECTRON)-full.nupkg" ./bin/aquareum-desktop-$(VERSION)-windows-amd64.$$SUM.nupkg \
213
-
&& mv "js/desktop/out/make/squirrel.windows/x64/Aquareum-$(VERSION_ELECTRON) Setup.exe" ./bin/aquareum-desktop-$(VERSION)-windows-amd64.exe
214
215
.PHONY: linux-arm64
216
linux-arm64:
···
232
# unbuffer here is a workaround for wine trying to pop up a terminal window and failing
233
.PHONY: windows-amd64-startup-test
234
windows-amd64-startup-test:
235
-
bash -c 'set -euo pipefail && unbuffer wine64 ./build-windows-amd64/aquareum.exe self-test | cat'
236
237
.PHONY: node-all-platforms-macos
238
node-all-platforms-macos: app
239
meson setup --buildtype debugoptimized build-darwin-arm64 $(OPTS)
240
meson compile -C build-darwin-arm64
241
-
./util/mac-codesign.sh ./build-darwin-arm64/aquareum
242
cd build-darwin-arm64 \
243
-
&& tar -czvf ../bin/aquareum-$(VERSION)-darwin-arm64.tar.gz ./aquareum \
244
&& cd -
245
-
./build-darwin-arm64/aquareum --version
246
-
./build-darwin-arm64/aquareum self-test
247
$(MAKE) link-test-macos
248
rustup target add x86_64-apple-darwin
249
meson setup --buildtype debugoptimized --cross-file util/darwin-amd64-apple.ini build-darwin-amd64 $(OPTS)
250
meson compile -C build-darwin-amd64
251
-
./util/mac-codesign.sh ./build-darwin-amd64/aquareum
252
cd build-darwin-amd64 \
253
-
&& tar -czvf ../bin/aquareum-$(VERSION)-darwin-amd64.tar.gz ./aquareum \
254
&& cd -
255
-
./build-darwin-amd64/aquareum --version
256
-
./build-darwin-arm64/aquareum self-test
257
$(MAKE) desktop-macos
258
meson test -C build-darwin-arm64 go-tests
259
···
264
&& yarn run make --platform darwin --arch arm64 \
265
&& yarn run make --platform darwin --arch x64 \
266
&& cd - \
267
-
&& mv js/desktop/out/make/Aquareum-$(VERSION_ELECTRON)-x64.dmg ./bin/aquareum-desktop-$(VERSION)-darwin-amd64.dmg \
268
-
&& mv js/desktop/out/make/Aquareum-$(VERSION_ELECTRON)-arm64.dmg ./bin/aquareum-desktop-$(VERSION)-darwin-arm64.dmg \
269
-
&& mv js/desktop/out/make/zip/darwin/x64/Aquareum-darwin-x64-$(VERSION_ELECTRON).zip ./bin/aquareum-desktop-$(VERSION)-darwin-amd64.zip \
270
-
&& mv js/desktop/out/make/zip/darwin/arm64/Aquareum-darwin-arm64-$(VERSION_ELECTRON).zip ./bin/aquareum-desktop-$(VERSION)-darwin-arm64.zip
271
272
.PHONY: selftest-macos
273
selftest-macos:
274
-
js/desktop/out/Aquareum-darwin-arm64/Aquareum.app/Contents/MacOS/Aquareum -- --self-test
275
276
# link your local version of mist for dev
277
.PHONY: link-mist
···
303
.PHONY: docker-build-builder
304
docker-build-builder:
305
cd docker \
306
-
&& docker build --target=builder --os=linux --arch=amd64 -f build.Dockerfile -t aqrm.io/aquareum-tv/aquareum:builder .
307
308
.PHONY: docker-build-builder
309
docker-build-in-container:
310
-
docker run -v $$(pwd):$$(pwd) -w $$(pwd) --rm -it aqrm.io/aquareum-tv/aquareum:builder make app-and-node
311
312
.PHONY: docker-release
313
docker-release:
314
cd docker \
315
&& docker build -f release.Dockerfile \
316
--build-arg TARGETARCH=$(BUILDARCH) \
317
-
-t aqrm.io/aquareum-tv/aquareum \
318
.
319
320
.PHONY: ci-upload
···
324
ci-upload-node: node-all-platforms
325
for GOOS in linux; do \
326
for GOARCH in amd64 arm64; do \
327
-
export file=aquareum-$(VERSION)-$$GOOS-$$GOARCH.tar.gz \
328
&& $(MAKE) ci-upload-file upload_file=$$file; \
329
-
export file=aquareum-desktop-$(VERSION)-$$GOOS-$$GOARCH.AppImage \
330
&& $(MAKE) ci-upload-file upload_file=$$file; \
331
done \
332
done;
333
for GOOS in windows; do \
334
for GOARCH in amd64; do \
335
-
export file=aquareum-$(VERSION)-$$GOOS-$$GOARCH.zip \
336
&& $(MAKE) ci-upload-file upload_file=$$file; \
337
-
export file=aquareum-desktop-$(VERSION)-$$GOOS-$$GOARCH.exe \
338
&& $(MAKE) ci-upload-file upload_file=$$file; \
339
-
export SUM=$$(cat bin/aquareum-desktop-$(VERSION)-$$GOOS-$$GOARCH.nupkg.sha1) \
340
-
&& export file=aquareum-desktop-$(VERSION)-$$GOOS-$$GOARCH.$$SUM.nupkg \
341
&& $(MAKE) ci-upload-file upload_file=$$file; \
342
done \
343
done;
···
346
ci-upload-node-macos: node-all-platforms-macos
347
for GOOS in darwin; do \
348
for GOARCH in amd64 arm64; do \
349
-
export file=aquareum-$(VERSION)-$$GOOS-$$GOARCH.tar.gz \
350
&& $(MAKE) ci-upload-file upload_file=$$file; \
351
-
export file=aquareum-desktop-$(VERSION)-$$GOOS-$$GOARCH.dmg \
352
&& $(MAKE) ci-upload-file upload_file=$$file; \
353
-
export file=aquareum-desktop-$(VERSION)-$$GOOS-$$GOARCH.zip \
354
&& $(MAKE) ci-upload-file upload_file=$$file; \
355
done \
356
done;
357
358
.PHONY: ci-upload-android
359
ci-upload-android: android
360
-
$(MAKE) ci-upload-file upload_file=aquareum-$(VERSION)-android-release.apk \
361
-
&& $(MAKE) ci-upload-file upload_file=aquareum-$(VERSION)-android-debug.apk \
362
-
&& $(MAKE) ci-upload-file upload_file=aquareum-$(VERSION)-android-release.aab \
363
-
&& $(MAKE) ci-upload-file upload_file=aquareum-$(VERSION)-android-debug.aab
364
365
.PHONY: ci-upload-ios
366
ci-upload-ios: ios
367
-
$(MAKE) ci-upload-file upload_file=aquareum-$(VERSION)-ios-release.xcarchive.tar.gz
368
369
upload_file?=""
370
.PHONY: ci-upload-file
···
40
.PHONY: node
41
node: schema
42
$(MAKE) meson-setup
43
+
meson compile -C $(BUILDDIR) streamplace
44
45
.PHONY: schema
46
schema:
···
55
LINUX_LINK_COUNT=5
56
.PHONY: link-test-linux
57
link-test-linux:
58
+
count=$(shell ldd ./build-linux-amd64/streamplace | wc -l) \
59
&& echo $$count \
60
&& if [ "$$count" != "$(LINUX_LINK_COUNT)" ]; then echo "ldd reports new libaries linked! want $(LINUX_LINK_COUNT) got $$count" \
61
+
&& ldd ./build-linux-amd64/streamplace \
62
&& exit 1; \
63
fi
64
65
MACOS_LINK_COUNT=10
66
.PHONY: link-test-macos
67
link-test-macos:
68
+
count=$(shell otool -L ./build-darwin-arm64/streamplace | wc -l | xargs) \
69
&& echo $$count \
70
&& if [ "$$count" != "$(MACOS_LINK_COUNT)" ]; then echo "otool -L reports new libaries linked! want $(MACOS_LINK_COUNT) got $$count" \
71
+
&& otool -L ./build-darwin-arm64/streamplace \
72
&& exit 1; \
73
fi
74
75
WINDOWS_LINK_COUNT=16
76
.PHONY: link-test-windows
77
link-test-windows:
78
+
count=$(shell x86_64-w64-mingw32-objdump -p ./build-windows-amd64/streamplace.exe | grep "DLL Name" | wc -l | xargs) \
79
&& echo $$count \
80
&& if [ "$$count" != "$(WINDOWS_LINK_COUNT)" ]; then echo "x86_64-w64-mingw32-objdump -p reports new libaries linked! want $(WINDOWS_LINK_COUNT) got $$count" \
81
+
&& x86_64-w64-mingw32-objdump -p ./build-windows-amd64/streamplace.exe | grep "DLL Name" \
82
&& exit 1; \
83
fi
84
···
106
&& ./gradlew :app:bundleRelease \
107
&& ./gradlew :app:bundleDebug \
108
&& cd - \
109
+
&& mv ./js/app/android/app/build/outputs/bundle/release/app-release.aab ./bin/streamplace-$(VERSION)-android-release.aab \
110
+
&& mv ./js/app/android/app/build/outputs/bundle/debug/app-debug.aab ./bin/streamplace-$(VERSION)-android-debug.aab \
111
&& cd bin \
112
+
&& java -jar ../.build/bundletool.jar build-apks --ks ../my-release-key.keystore --ks-key-alias alias_name --ks-pass pass:aquareum --bundle=streamplace-$(VERSION)-android-release.aab --output=streamplace-$(VERSION)-android-release.apks --mode=universal \
113
+
&& java -jar ../.build/bundletool.jar build-apks --ks ../my-release-key.keystore --ks-key-alias alias_name --ks-pass pass:aquareum --bundle=streamplace-$(VERSION)-android-debug.aab --output=streamplace-$(VERSION)-android-debug.apks --mode=universal \
114
+
&& unzip streamplace-$(VERSION)-android-release.apks && mv universal.apk streamplace-$(VERSION)-android-release.apk && rm toc.pb \
115
+
&& unzip streamplace-$(VERSION)-android-debug.apks && mv universal.apk streamplace-$(VERSION)-android-debug.apk && rm toc.pb
116
117
.PHONY: ios
118
ios: app
119
xcodebuild \
120
+
-workspace ./js/app/ios/Streamplace.xcworkspace \
121
-sdk iphoneos \
122
-configuration Release \
123
+
-scheme Streamplace \
124
+
-archivePath ./bin/streamplace-$(VERSION)-ios-release.xcarchive \
125
CODE_SIGN_IDENTITY=- \
126
AD_HOC_CODE_SIGNING_ALLOWED=YES \
127
CODE_SIGN_STYLE=Automatic \
128
DEVELOPMENT_TEAM=ZZZZZZZZZZ \
129
clean archive | xcpretty \
130
&& cd bin \
131
+
&& tar -czvf streamplace-$(VERSION)-ios-release.xcarchive.tar.gz streamplace-$(VERSION)-ios-release.xcarchive
132
133
+
# xcodebuild -exportArchive -archivePath ./bin/streamplace-$(VERSION)-ios-release.xcarchive -exportOptionsPlist ./js/app/exportOptions.plist -exportPath ./bin/streamplace-$(VERSION)-ios-release.ipa
134
135
.build/bundletool.jar:
136
mkdir -p .build \
···
199
&& yarn run make --platform linux --arch x64 \
200
&& yarn run make --platform linux --arch arm64 \
201
&& cd - \
202
+
&& mv "js/desktop/out/make/AppImage/x64/Streamplace-$(VERSION_ELECTRON)-x64.AppImage" ./bin/streamplace-desktop-$(VERSION)-linux-amd64.AppImage \
203
+
&& mv "js/desktop/out/make/AppImage/arm64/Streamplace-$(VERSION_ELECTRON)-arm64.AppImage" ./bin/streamplace-desktop-$(VERSION)-linux-arm64.AppImage
204
205
.PHONY: desktop-windows
206
desktop-windows:
207
cd js/desktop \
208
&& yarn run make --platform win32 --arch x64 \
209
&& cd - \
210
+
&& export SUM=$$(cat ./js/desktop/out/make/squirrel.windows/x64/streamplace_desktop-$(VERSION_ELECTRON)-full.nupkg | openssl sha1 | awk '{ print $$2 }') \
211
+
&& echo $$SUM > ./bin/streamplace-desktop-$(VERSION)-windows-amd64.nupkg.sha1 \
212
+
&& mv "js/desktop/out/make/squirrel.windows/x64/streamplace_desktop-$(VERSION_ELECTRON)-full.nupkg" ./bin/streamplace-desktop-$(VERSION)-windows-amd64.$$SUM.nupkg \
213
+
&& mv "js/desktop/out/make/squirrel.windows/x64/Streamplace-$(VERSION_ELECTRON) Setup.exe" ./bin/streamplace-desktop-$(VERSION)-windows-amd64.exe
214
215
.PHONY: linux-arm64
216
linux-arm64:
···
232
# unbuffer here is a workaround for wine trying to pop up a terminal window and failing
233
.PHONY: windows-amd64-startup-test
234
windows-amd64-startup-test:
235
+
bash -c 'set -euo pipefail && unbuffer wine64 ./build-windows-amd64/streamplace.exe self-test | cat'
236
237
.PHONY: node-all-platforms-macos
238
node-all-platforms-macos: app
239
meson setup --buildtype debugoptimized build-darwin-arm64 $(OPTS)
240
meson compile -C build-darwin-arm64
241
+
./util/mac-codesign.sh ./build-darwin-arm64/streamplace
242
cd build-darwin-arm64 \
243
+
&& tar -czvf ../bin/streamplace-$(VERSION)-darwin-arm64.tar.gz ./streamplace \
244
&& cd -
245
+
./build-darwin-arm64/streamplace --version
246
+
./build-darwin-arm64/streamplace self-test
247
$(MAKE) link-test-macos
248
rustup target add x86_64-apple-darwin
249
meson setup --buildtype debugoptimized --cross-file util/darwin-amd64-apple.ini build-darwin-amd64 $(OPTS)
250
meson compile -C build-darwin-amd64
251
+
./util/mac-codesign.sh ./build-darwin-amd64/streamplace
252
cd build-darwin-amd64 \
253
+
&& tar -czvf ../bin/streamplace-$(VERSION)-darwin-amd64.tar.gz ./streamplace \
254
&& cd -
255
+
./build-darwin-amd64/streamplace --version
256
+
./build-darwin-arm64/streamplace self-test
257
$(MAKE) desktop-macos
258
meson test -C build-darwin-arm64 go-tests
259
···
264
&& yarn run make --platform darwin --arch arm64 \
265
&& yarn run make --platform darwin --arch x64 \
266
&& cd - \
267
+
&& mv js/desktop/out/make/Streamplace-$(VERSION_ELECTRON)-x64.dmg ./bin/streamplace-desktop-$(VERSION)-darwin-amd64.dmg \
268
+
&& mv js/desktop/out/make/Streamplace-$(VERSION_ELECTRON)-arm64.dmg ./bin/streamplace-desktop-$(VERSION)-darwin-arm64.dmg \
269
+
&& mv js/desktop/out/make/zip/darwin/x64/Streamplace-darwin-x64-$(VERSION_ELECTRON).zip ./bin/streamplace-desktop-$(VERSION)-darwin-amd64.zip \
270
+
&& mv js/desktop/out/make/zip/darwin/arm64/Streamplace-darwin-arm64-$(VERSION_ELECTRON).zip ./bin/streamplace-desktop-$(VERSION)-darwin-arm64.zip
271
272
.PHONY: selftest-macos
273
selftest-macos:
274
+
js/desktop/out/Streamplace-darwin-arm64/Streamplace.app/Contents/MacOS/Streamplace -- --self-test
275
276
# link your local version of mist for dev
277
.PHONY: link-mist
···
303
.PHONY: docker-build-builder
304
docker-build-builder:
305
cd docker \
306
+
&& docker build --target=builder --os=linux --arch=amd64 -f build.Dockerfile -t aqrm.io/streamplace/streamplace:builder .
307
308
.PHONY: docker-build-builder
309
docker-build-in-container:
310
+
docker run -v $$(pwd):$$(pwd) -w $$(pwd) --rm -it aqrm.io/streamplace/streamplace:builder make app-and-node
311
312
.PHONY: docker-release
313
docker-release:
314
cd docker \
315
&& docker build -f release.Dockerfile \
316
--build-arg TARGETARCH=$(BUILDARCH) \
317
+
-t aqrm.io/streamplace/streamplace \
318
.
319
320
.PHONY: ci-upload
···
324
ci-upload-node: node-all-platforms
325
for GOOS in linux; do \
326
for GOARCH in amd64 arm64; do \
327
+
export file=streamplace-$(VERSION)-$$GOOS-$$GOARCH.tar.gz \
328
&& $(MAKE) ci-upload-file upload_file=$$file; \
329
+
export file=streamplace-desktop-$(VERSION)-$$GOOS-$$GOARCH.AppImage \
330
&& $(MAKE) ci-upload-file upload_file=$$file; \
331
done \
332
done;
333
for GOOS in windows; do \
334
for GOARCH in amd64; do \
335
+
export file=streamplace-$(VERSION)-$$GOOS-$$GOARCH.zip \
336
&& $(MAKE) ci-upload-file upload_file=$$file; \
337
+
export file=streamplace-desktop-$(VERSION)-$$GOOS-$$GOARCH.exe \
338
&& $(MAKE) ci-upload-file upload_file=$$file; \
339
+
export SUM=$$(cat bin/streamplace-desktop-$(VERSION)-$$GOOS-$$GOARCH.nupkg.sha1) \
340
+
&& export file=streamplace-desktop-$(VERSION)-$$GOOS-$$GOARCH.$$SUM.nupkg \
341
&& $(MAKE) ci-upload-file upload_file=$$file; \
342
done \
343
done;
···
346
ci-upload-node-macos: node-all-platforms-macos
347
for GOOS in darwin; do \
348
for GOARCH in amd64 arm64; do \
349
+
export file=streamplace-$(VERSION)-$$GOOS-$$GOARCH.tar.gz \
350
&& $(MAKE) ci-upload-file upload_file=$$file; \
351
+
export file=streamplace-desktop-$(VERSION)-$$GOOS-$$GOARCH.dmg \
352
&& $(MAKE) ci-upload-file upload_file=$$file; \
353
+
export file=streamplace-desktop-$(VERSION)-$$GOOS-$$GOARCH.zip \
354
&& $(MAKE) ci-upload-file upload_file=$$file; \
355
done \
356
done;
357
358
.PHONY: ci-upload-android
359
ci-upload-android: android
360
+
$(MAKE) ci-upload-file upload_file=streamplace-$(VERSION)-android-release.apk \
361
+
&& $(MAKE) ci-upload-file upload_file=streamplace-$(VERSION)-android-debug.apk \
362
+
&& $(MAKE) ci-upload-file upload_file=streamplace-$(VERSION)-android-release.aab \
363
+
&& $(MAKE) ci-upload-file upload_file=streamplace-$(VERSION)-android-debug.aab
364
365
.PHONY: ci-upload-ios
366
ci-upload-ios: ios
367
+
$(MAKE) ci-upload-file upload_file=streamplace-$(VERSION)-ios-release.xcarchive.tar.gz
368
369
upload_file?=""
370
.PHONY: ci-upload-file
+6
-6
README.md
+6
-6
README.md
···
1
-
# Aquareum
2
3
## The Video Layer for Everything
4
···
21
22
```
23
make node
24
-
./build-darwin-arm64/aquareum
25
26
// or
27
28
-
./build-linux-amd64/aquareum
29
```
30
31
**Web Development**
···
56
that happen, you can set the `AQ_APP_SCHEME` environment variable to the scheme
57
you want to use; it must match reverse of the URL of a publicly accessible
58
server with an HTTPS cert. So, if you're exposing your app on
59
-
aquareum.example.com, you could run the app with
60
61
```
62
-
export AQ_APP_SCHEME=com.example.aquareum
63
yarn run app ios
64
```
65
···
77
```
78
79
Adding those two environment variables to your shell will give your desktop app
80
-
administrative access over your local Aquareum node.
···
1
+
# Streamplace
2
3
## The Video Layer for Everything
4
···
21
22
```
23
make node
24
+
./build-darwin-arm64/streamplace
25
26
// or
27
28
+
./build-linux-amd64/streamplace
29
```
30
31
**Web Development**
···
56
that happen, you can set the `AQ_APP_SCHEME` environment variable to the scheme
57
you want to use; it must match reverse of the URL of a publicly accessible
58
server with an HTTPS cert. So, if you're exposing your app on
59
+
streamplace.example.com, you could run the app with
60
61
```
62
+
export AQ_APP_SCHEME=com.example.streamplace
63
yarn run app ios
64
```
65
···
77
```
78
79
Adding those two environment variables to your shell will give your desktop app
80
+
administrative access over your local Streamplace node.
aquareum-logo.svg
streamplace-logo.svg
aquareum-logo.svg
streamplace-logo.svg
-7
cmd/aquareum/aquareum.c
-7
cmd/aquareum/aquareum.c
+6
-6
cmd/libaquareum/aquareum.go
cmd/libstreamplace/streamplace.go
+6
-6
cmd/libaquareum/aquareum.go
cmd/libstreamplace/streamplace.go
···
4
"context"
5
"strconv"
6
7
-
"aquareum.tv/aquareum/pkg/config"
8
-
"aquareum.tv/aquareum/pkg/log"
9
10
-
"aquareum.tv/aquareum/pkg/cmd"
11
// _ "github.com/go-gst/go-glib/glib"
12
// _ "github.com/go-gst/go-gst/gst"
13
)
···
15
//#cgo LDFLAGS: -lz
16
import "C"
17
18
-
//export AquareumMain
19
-
func AquareumMain() {
20
i, err := strconv.ParseInt(BuildTime, 10, 64)
21
if err != nil {
22
panic(err)
···
32
}
33
34
func main() {
35
-
AquareumMain()
36
}
···
4
"context"
5
"strconv"
6
7
+
"stream.place/streamplace/pkg/config"
8
+
"stream.place/streamplace/pkg/log"
9
10
+
"stream.place/streamplace/pkg/cmd"
11
// _ "github.com/go-gst/go-glib/glib"
12
// _ "github.com/go-gst/go-gst/gst"
13
)
···
15
//#cgo LDFLAGS: -lz
16
import "C"
17
18
+
//export StreamplaceMain
19
+
func StreamplaceMain() {
20
i, err := strconv.ParseInt(BuildTime, 10, 64)
21
if err != nil {
22
panic(err)
···
32
}
33
34
func main() {
35
+
StreamplaceMain()
36
}
cmd/libaquareum/build-flags.go
cmd/libstreamplace/build-flags.go
cmd/libaquareum/build-flags.go
cmd/libstreamplace/build-flags.go
+7
cmd/streamplace/streamplace.c
+7
cmd/streamplace/streamplace.c
+4
-4
docker/build.Dockerfile
+4
-4
docker/build.Dockerfile
···
67
ARG CI_COMMIT_BRANCH=next
68
ENV CI_COMMIT_BRANCH $CI_COMMIT_BRANCH
69
WORKDIR /cached-build
70
-
RUN git clone https://git.aquareum.tv/aquareum-tv/aquareum \
71
-
&& cd aquareum \
72
&& make version install check app android -j$(nproc) \
73
&& make node \
74
&& make test \
75
&& cd .. \
76
-
&& rm -rf aquareum
77
78
-
LABEL org.opencontainers.image.authors="support@aquareum.tv"
···
67
ARG CI_COMMIT_BRANCH=next
68
ENV CI_COMMIT_BRANCH $CI_COMMIT_BRANCH
69
WORKDIR /cached-build
70
+
RUN git clone https://git.aquareum.tv/streamplace/streamplace \
71
+
&& cd streamplace \
72
&& make version install check app android -j$(nproc) \
73
&& make node \
74
&& make test \
75
&& cd .. \
76
+
&& rm -rf streamplace
77
78
+
LABEL org.opencontainers.image.authors="support@stream.place"
+5
-5
docker/release.Dockerfile
+5
-5
docker/release.Dockerfile
···
2
ARG TARGETARCH
3
FROM --platform=linux/$TARGETARCH ubuntu:24.04
4
RUN apt update && apt install -y curl
5
-
ARG AQUAREUM_URL
6
-
ENV AQUAREUM_URL $AQUAREUM_URL
7
-
RUN echo "downloading $AQUAREUM_URL" && cd /usr/local/bin && curl -L "$AQUAREUM_URL" | tar xzv
8
-
RUN aquareum self-test
9
-
CMD aquareum
···
2
ARG TARGETARCH
3
FROM --platform=linux/$TARGETARCH ubuntu:24.04
4
RUN apt update && apt install -y curl
5
+
ARG STREAMPLACE_URL
6
+
ENV STREAMPLACE_URL $STREAMPLACE_URL
7
+
RUN echo "downloading $STREAMPLACE_URL" && cd /usr/local/bin && curl -L "$STREAMPLACE_URL" | tar xzv
8
+
RUN streamplace self-test
9
+
CMD streamplace
+4
-4
go.mod
+4
-4
go.mod
···
1
-
module aquareum.tv/aquareum
2
3
go 1.22.4
4
···
8
9
require (
10
firebase.google.com/go/v4 v4.14.1
11
-
git.aquareum.tv/aquareum-tv/c2pa-go v0.0.0-20240913223408-68f9878542d4
12
github.com/NYTimes/gziphandler v1.1.1
13
github.com/ThalesGroup/crypto11 v0.0.0-00010101000000-000000000000
14
github.com/bluesky-social/indigo v0.0.0-20241119234843-9198b7903723
···
28
github.com/julienschmidt/httprouter v1.3.0
29
github.com/livepeer/lpms v0.0.0-20240812093642-b5181eb92cb2
30
github.com/lmittmann/tint v1.0.4
31
github.com/orandin/slog-gorm v1.3.2
32
github.com/peterbourgon/ff/v3 v3.3.1
33
github.com/pion/interceptor v0.1.37
34
github.com/pion/webrtc/v4 v4.0.5
35
github.com/piprate/json-gold v0.5.0
36
github.com/rs/cors v1.7.0
···
74
cloud.google.com/go/storage v1.41.0 // indirect
75
dario.cat/mergo v1.0.0 // indirect
76
filippo.io/edwards25519 v1.1.0 // indirect
77
github.com/BurntSushi/toml v1.4.0 // indirect
78
github.com/MicahParks/keyfunc v1.9.0 // indirect
79
github.com/Microsoft/go-winio v0.6.2 // indirect
···
140
github.com/mitchellh/gox v1.0.1 // indirect
141
github.com/mitchellh/iochan v1.0.0 // indirect
142
github.com/mmcloughlin/addchain v0.4.0 // indirect
143
-
github.com/mr-tron/base58 v1.2.0 // indirect
144
github.com/multiformats/go-base32 v0.1.0 // indirect
145
github.com/multiformats/go-base36 v0.2.0 // indirect
146
github.com/multiformats/go-multibase v0.2.0 // indirect
···
155
github.com/pion/logging v0.2.2 // indirect
156
github.com/pion/mdns/v2 v2.0.7 // indirect
157
github.com/pion/randutil v0.1.0 // indirect
158
-
github.com/pion/rtcp v1.2.14 // indirect
159
github.com/pion/rtp v1.8.9 // indirect
160
github.com/pion/sctp v1.8.34 // indirect
161
github.com/pion/sdp/v3 v3.0.9 // indirect
···
1
+
module stream.place/streamplace
2
3
go 1.22.4
4
···
8
9
require (
10
firebase.google.com/go/v4 v4.14.1
11
github.com/NYTimes/gziphandler v1.1.1
12
github.com/ThalesGroup/crypto11 v0.0.0-00010101000000-000000000000
13
github.com/bluesky-social/indigo v0.0.0-20241119234843-9198b7903723
···
27
github.com/julienschmidt/httprouter v1.3.0
28
github.com/livepeer/lpms v0.0.0-20240812093642-b5181eb92cb2
29
github.com/lmittmann/tint v1.0.4
30
+
github.com/mr-tron/base58 v1.2.0
31
github.com/orandin/slog-gorm v1.3.2
32
github.com/peterbourgon/ff/v3 v3.3.1
33
github.com/pion/interceptor v0.1.37
34
+
github.com/pion/rtcp v1.2.14
35
github.com/pion/webrtc/v4 v4.0.5
36
github.com/piprate/json-gold v0.5.0
37
github.com/rs/cors v1.7.0
···
75
cloud.google.com/go/storage v1.41.0 // indirect
76
dario.cat/mergo v1.0.0 // indirect
77
filippo.io/edwards25519 v1.1.0 // indirect
78
+
git.aquareum.tv/streamplace/c2pa-go v0.0.0-20250116060241-2931a03e9814
79
github.com/BurntSushi/toml v1.4.0 // indirect
80
github.com/MicahParks/keyfunc v1.9.0 // indirect
81
github.com/Microsoft/go-winio v0.6.2 // indirect
···
142
github.com/mitchellh/gox v1.0.1 // indirect
143
github.com/mitchellh/iochan v1.0.0 // indirect
144
github.com/mmcloughlin/addchain v0.4.0 // indirect
145
github.com/multiformats/go-base32 v0.1.0 // indirect
146
github.com/multiformats/go-base36 v0.2.0 // indirect
147
github.com/multiformats/go-multibase v0.2.0 // indirect
···
156
github.com/pion/logging v0.2.2 // indirect
157
github.com/pion/mdns/v2 v2.0.7 // indirect
158
github.com/pion/randutil v0.1.0 // indirect
159
github.com/pion/rtp v1.8.9 // indirect
160
github.com/pion/sctp v1.8.34 // indirect
161
github.com/pion/sdp/v3 v3.0.9 // indirect
+2
-2
go.sum
+2
-2
go.sum
···
21
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
22
firebase.google.com/go/v4 v4.14.1 h1:4qiUETaFRWoFGE1XP5VbcEdtPX93Qs+8B/7KvP2825g=
23
firebase.google.com/go/v4 v4.14.1/go.mod h1:fgk2XshgNDEKaioKco+AouiegSI9oTWVqRaBdTTGBoM=
24
-
git.aquareum.tv/aquareum-tv/c2pa-go v0.0.0-20240913223408-68f9878542d4 h1:bZfabLYa/62SPeHd+mUiA21BM5K930LWOSkBDjUTxnI=
25
-
git.aquareum.tv/aquareum-tv/c2pa-go v0.0.0-20240913223408-68f9878542d4/go.mod h1:lp4UzqUyNZ4gieOSCdjsGoSUudZsDrBpsBgnRoNLlSw=
26
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
27
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
28
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
···
21
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
22
firebase.google.com/go/v4 v4.14.1 h1:4qiUETaFRWoFGE1XP5VbcEdtPX93Qs+8B/7KvP2825g=
23
firebase.google.com/go/v4 v4.14.1/go.mod h1:fgk2XshgNDEKaioKco+AouiegSI9oTWVqRaBdTTGBoM=
24
+
git.aquareum.tv/streamplace/c2pa-go v0.0.0-20250116060241-2931a03e9814 h1:FratCcTCyDzi+9eXybSLk4Fc92IDpmQdxiYj7tBWNLI=
25
+
git.aquareum.tv/streamplace/c2pa-go v0.0.0-20250116060241-2931a03e9814/go.mod h1:6Oc4eGu9YOCOa2Z00Vso6UrmIoNnnYqL/1FrAlJi+EA=
26
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
27
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
28
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+2
-2
hack/push.mjs
+2
-2
hack/push.mjs
···
13
// console.log(tokens)
14
// process.exit(0)
15
16
-
// curl -H "Authorization: Bearer $AQ_ADMIN" https://aquareum.tv/api/notification
17
18
const delay = (ms) => new Promise((r) => setTimeout(r, ms));
19
const blast = async (body) => {
20
-
const tokensRes = await fetch("https://aquareum.tv/api/notification", {
21
headers: {
22
Authorization: `Bearer ${process.env.AQ_ADMIN}`,
23
},
···
13
// console.log(tokens)
14
// process.exit(0)
15
16
+
// curl -H "Authorization: Bearer $AQ_ADMIN" https://stream.place/api/notification
17
18
const delay = (ms) => new Promise((r) => setTimeout(r, ms));
19
const blast = async (body) => {
20
+
const tokensRes = await fetch("https://stream.place/api/notification", {
21
headers: {
22
Authorization: `Bearer ${process.env.AQ_ADMIN}`,
23
},
+1
-1
js/app/.env.development
+1
-1
js/app/.env.development
+1
-1
js/app/.env.production
+1
-1
js/app/.env.production
+1
-1
js/app/.gitignore
+1
-1
js/app/.gitignore
+2
-2
js/app/app.config.ts
+2
-2
js/app/app.config.ts
···
52
const isProd =
53
process.env["AQ_PRODUCTION_RELEASE"] === "true" || !!process.env.CI;
54
const pkg = require("./package.json");
55
-
const name = isProd ? "Aquareum" : "Devquarium";
56
const bundle = isProd ? "tv.aquareum" : "tv.aquareum.dev";
57
const scheme = process.env["AQ_APP_SCHEME"] ?? bundle;
58
return {
···
177
},
178
updates: isProd
179
? {
180
-
url: `https://aquareum.tv/api/manifest`,
181
enabled: true,
182
checkAutomatically: "ON_LOAD",
183
fallbackToCacheTimeout: 30000,
···
52
const isProd =
53
process.env["AQ_PRODUCTION_RELEASE"] === "true" || !!process.env.CI;
54
const pkg = require("./package.json");
55
+
const name = isProd ? "Streamplace" : "Devplace";
56
const bundle = isProd ? "tv.aquareum" : "tv.aquareum.dev";
57
const scheme = process.env["AQ_APP_SCHEME"] ?? bundle;
58
return {
···
177
},
178
updates: isProd
179
? {
180
+
url: `https://stream.place/api/manifest`,
181
enabled: true,
182
checkAutomatically: "ON_LOAD",
183
fallbackToCacheTimeout: 30000,
+1
-1
js/app/app.go
+1
-1
js/app/app.go
+2
-2
js/app/components/get-apps.tsx
+2
-2
js/app/components/get-apps.tsx
···
9
<XStack justifyContent="center">
10
<Anchor
11
target="_blank"
12
-
href="https://apps.apple.com/us/app/aquareum/id6535653195"
13
>
14
<Image
15
width={WIDTH}
···
20
</Anchor>
21
<Anchor
22
target="_blank"
23
-
href="https://play.google.com/store/apps/details?id=tv.aquareum"
24
>
25
<Image
26
width={WIDTH}
···
9
<XStack justifyContent="center">
10
<Anchor
11
target="_blank"
12
+
href="https://apps.apple.com/us/app/streamplace/id6535653195"
13
>
14
<Image
15
width={WIDTH}
···
20
</Anchor>
21
<Anchor
22
target="_blank"
23
+
href="https://play.google.com/store/apps/details?id=aquareum.tv"
24
>
25
<Image
26
width={WIDTH}
+2
-2
js/app/components/player/player.tsx
+2
-2
js/app/components/player/player.tsx
···
1
-
import useAquareumNode from "hooks/useAquareumNode";
2
import usePlatform from "hooks/usePlatform";
3
import { uuidv7 } from "hooks/uuid";
4
import { useEffect, useMemo, useState } from "react";
···
78
if (props.forceProtocol) {
79
defProto = props.forceProtocol;
80
}
81
-
const { url } = useAquareumNode();
82
const info = usePlatform();
83
const playerEvent = async (
84
time: string,
···
1
+
import useStreamplaceNode from "hooks/useStreamplaceNode";
2
import usePlatform from "hooks/usePlatform";
3
import { uuidv7 } from "hooks/uuid";
4
import { useEffect, useMemo, useState } from "react";
···
78
if (props.forceProtocol) {
79
defProto = props.forceProtocol;
80
}
81
+
const { url } = useStreamplaceNode();
82
const info = usePlatform();
83
const playerEvent = async (
84
time: string,
+2
-2
js/app/components/player/video.tsx
+2
-2
js/app/components/player/video.tsx
···
19
} from "./props";
20
import { srcToUrl } from "./shared";
21
import useWebRTC, { useWebRTCIngest } from "./use-webrtc";
22
-
import useAquareumNode from "hooks/useAquareumNode";
23
import { useAppDispatch, useAppSelector } from "store/hooks";
24
import { selectStoredKey } from "features/bluesky/blueskySlice";
25
import { usePlayer } from "features/player/playerSlice";
···
238
}
239
}, []);
240
241
-
const { url } = useAquareumNode();
242
const [localMediaStream, setLocalMediaStream] = useState<MediaStream | null>(
243
null,
244
);
···
19
} from "./props";
20
import { srcToUrl } from "./shared";
21
import useWebRTC, { useWebRTCIngest } from "./use-webrtc";
22
+
import useStreamplaceNode from "hooks/useStreamplaceNode";
23
import { useAppDispatch, useAppSelector } from "store/hooks";
24
import { selectStoredKey } from "features/bluesky/blueskySlice";
25
import { usePlayer } from "features/player/playerSlice";
···
238
}
239
}, []);
240
241
+
const { url } = useStreamplaceNode();
242
const [localMediaStream, setLocalMediaStream] = useState<MediaStream | null>(
243
null,
244
);
+4
-4
js/app/components/settings/settings.tsx
+4
-4
js/app/components/settings/settings.tsx
···
1
-
import { setURL } from "features/aquareum/aquareumSlice";
2
-
import useAquareumNode from "hooks/useAquareumNode";
3
import { useState } from "react";
4
import { useAppDispatch } from "store/hooks";
5
import { Button, Form, H3, Input, View, XStack } from "tamagui";
···
7
8
export function Settings() {
9
const dispatch = useAppDispatch();
10
-
const { url } = useAquareumNode();
11
const [newUrl, setNewUrl] = useState("");
12
const onSubmit = () => {
13
dispatch(setURL(newUrl));
···
24
padding="$4"
25
onSubmit={onSubmit}
26
>
27
-
<H3 margin="$2">Change Aquareum Node URL</H3>
28
<XStack alignItems="center" space="$2">
29
<Input
30
value={newUrl}
···
1
+
import { setURL } from "features/streamplace/streamplaceSlice";
2
+
import useStreamplaceNode from "hooks/useStreamplaceNode";
3
import { useState } from "react";
4
import { useAppDispatch } from "store/hooks";
5
import { Button, Form, H3, Input, View, XStack } from "tamagui";
···
7
8
export function Settings() {
9
const dispatch = useAppDispatch();
10
+
const { url } = useStreamplaceNode();
11
const [newUrl, setNewUrl] = useState("");
12
const onSubmit = () => {
13
dispatch(setURL(newUrl));
···
24
padding="$4"
25
onSubmit={onSubmit}
26
>
27
+
<H3 margin="$2">Change Streamplace Node URL</H3>
28
<XStack alignItems="center" space="$2">
29
<Input
30
value={newUrl}
+3
-2
js/app/components/settings/updates.native.tsx
+3
-2
js/app/components/settings/updates.native.tsx
···
50
>
51
<ToastViewport name="modal" top="$8" left={0} right={0} />
52
<View>
53
-
<H2 textAlign="center">Aquareum v{version}</H2>
54
<H5 textAlign="center" pb="$5">
55
{runTypeMessage}
56
</H5>
···
62
if (!res.isAvailable) {
63
toast.show("No update found", {
64
viewportName: "modal",
65
-
message: "You are on the latest version of Aquareum, hooray!",
66
});
67
}
68
} catch (e) {
···
50
>
51
<ToastViewport name="modal" top="$8" left={0} right={0} />
52
<View>
53
+
<H2 textAlign="center">Streamplace v{version}</H2>
54
<H5 textAlign="center" pb="$5">
55
{runTypeMessage}
56
</H5>
···
62
if (!res.isAvailable) {
63
toast.show("No update found", {
64
viewportName: "modal",
65
+
message:
66
+
"You are on the latest version of Streamplace, hooray!",
67
});
68
}
69
} catch (e) {
+1
-1
js/app/components/settings/updates.tsx
+1
-1
js/app/components/settings/updates.tsx
+3
-3
js/app/components/stream-list/stream-list.tsx
+3
-3
js/app/components/stream-list/stream-list.tsx
···
1
import AQLink from "components/aqlink";
2
import ErrorBox from "components/error/error";
3
import Loading from "components/loading/loading";
4
-
import useAquareumNode from "hooks/useAquareumNode";
5
import { useEffect, useState } from "react";
6
import { RefreshControl } from "react-native";
7
import { H6, Image, ScrollView, ScrollViewProps, Text, View } from "tamagui";
···
19
handle: string;
20
pds: string;
21
version: string;
22
-
aquareumKey: string;
23
rootCid: string;
24
};
25
···
35
const [error, setError] = useState<boolean>(false);
36
const [loading, setLoading] = useState<boolean>(false);
37
const [retryTime, setRetryTime] = useState<number>(Date.now());
38
-
const { url } = useAquareumNode();
39
useEffect(() => {
40
const interval = setInterval(() => {
41
setRetryTime(Date.now());
···
1
import AQLink from "components/aqlink";
2
import ErrorBox from "components/error/error";
3
import Loading from "components/loading/loading";
4
+
import useStreamplaceNode from "hooks/useStreamplaceNode";
5
import { useEffect, useState } from "react";
6
import { RefreshControl } from "react-native";
7
import { H6, Image, ScrollView, ScrollViewProps, Text, View } from "tamagui";
···
19
handle: string;
20
pds: string;
21
version: string;
22
+
streamplaceKey: string;
23
rootCid: string;
24
};
25
···
35
const [error, setError] = useState<boolean>(false);
36
const [loading, setLoading] = useState<boolean>(false);
37
const [retryTime, setRetryTime] = useState<number>(Date.now());
38
+
const { url } = useStreamplaceNode();
39
useEffect(() => {
40
const interval = setInterval(() => {
41
setRetryTime(Date.now());
+2
-1
js/app/constants/env.ts
+2
-1
js/app/constants/env.ts
-36
js/app/features/aquareum/aquareumProvider.tsx
-36
js/app/features/aquareum/aquareumProvider.tsx
···
1
-
import { createContext, useEffect } from "react";
2
-
import { DEFAULT_URL, initialize, selectAquareum } from "./aquareumSlice";
3
-
import { useAppDispatch, useAppSelector } from "store/hooks";
4
-
import Loading from "components/loading/loading";
5
-
import { View, Text } from "tamagui";
6
-
7
-
export const AquareumContext = createContext({
8
-
url: DEFAULT_URL,
9
-
});
10
-
11
-
export default function AquareumProvider({
12
-
children,
13
-
}: {
14
-
children: React.ReactNode;
15
-
}): React.ReactElement {
16
-
const aquareum = useAppSelector(selectAquareum);
17
-
const dispatch = useAppDispatch();
18
-
useEffect(() => {
19
-
if (!aquareum.initialized) {
20
-
dispatch(initialize());
21
-
}
22
-
}, [aquareum.initialized]);
23
-
if (!aquareum.initialized) {
24
-
return (
25
-
<View f={1}>
26
-
<Text>AquareumProvider loading...</Text>
27
-
<Loading />
28
-
</View>
29
-
);
30
-
}
31
-
return (
32
-
<AquareumContext.Provider value={{ url: aquareum.url }}>
33
-
{children}
34
-
</AquareumContext.Provider>
35
-
);
36
-
}
···
+20
-20
js/app/features/aquareum/aquareumSlice.tsx
js/app/features/streamplace/streamplaceSlice.tsx
+20
-20
js/app/features/aquareum/aquareumSlice.tsx
js/app/features/streamplace/streamplaceSlice.tsx
···
4
import schema from "generated/eip712-schema.json";
5
import Storage from "../../storage";
6
7
-
let DEFAULT_URL = process.env.EXPO_PUBLIC_AQUAREUM_URL as string;
8
if (isWeb && process.env.EXPO_PUBLIC_WEB_TRY_LOCAL === "true") {
9
try {
10
DEFAULT_URL = `${window.location.protocol}//${window.location.host}`;
···
20
did?: string;
21
}
22
23
-
export interface AquareumState {
24
url: string;
25
identity: Identity | null;
26
initialized: boolean;
27
}
28
29
-
const initialState: AquareumState = {
30
url: DEFAULT_URL,
31
identity: null,
32
initialized: false,
33
};
34
35
-
export const aquareumSlice = createAppSlice({
36
-
name: "aquareum",
37
initialState,
38
reducers: (create) => ({
39
initialize: create.asyncThunk(
40
async (_, { getState }) => {
41
-
let url = await Storage.getItem("aquareumUrl");
42
if (!url) {
43
url = DEFAULT_URL;
44
}
···
63
),
64
65
setURL: create.reducer((state, action: { payload: string }) => {
66
-
Storage.setItem("aquareumUrl", action.payload).catch((err) => {
67
console.error("setURL error", err);
68
});
69
return {
···
74
75
getIdentity: create.asyncThunk(
76
async (_, { getState }) => {
77
-
const { aquareum } = getState() as {
78
-
aquareum: AquareumState;
79
};
80
-
const res = await fetch(`${aquareum.url}/api/identity`);
81
return await res.json();
82
},
83
{
···
112
},
113
{ getState, dispatch },
114
) => {
115
-
let { aquareum } = getState() as {
116
-
aquareum: AquareumState;
117
};
118
-
if (!aquareum.identity) {
119
await dispatch(getIdentity());
120
}
121
-
({ aquareum } = getState() as {
122
-
aquareum: AquareumState;
123
});
124
-
if (!aquareum.identity) {
125
throw new Error("No identity");
126
}
127
const message = {
···
137
};
138
const signature = await signTypedData(toSign);
139
const res = await fetch(
140
-
`${aquareum.url}/api/identity/${aquareum.identity.id}`,
141
{
142
method: "PUT",
143
body: JSON.stringify({
···
169
}),
170
171
selectors: {
172
-
selectAquareum: (aquareum) => aquareum,
173
},
174
});
175
176
// Action creators are generated for each case reducer function.
177
export const { getIdentity, putIdentity, setURL, initialize } =
178
-
aquareumSlice.actions;
179
-
export const { selectAquareum } = aquareumSlice.selectors;
···
4
import schema from "generated/eip712-schema.json";
5
import Storage from "../../storage";
6
7
+
let DEFAULT_URL = process.env.EXPO_PUBLIC_STREAMPLACE_URL as string;
8
if (isWeb && process.env.EXPO_PUBLIC_WEB_TRY_LOCAL === "true") {
9
try {
10
DEFAULT_URL = `${window.location.protocol}//${window.location.host}`;
···
20
did?: string;
21
}
22
23
+
export interface StreamplaceState {
24
url: string;
25
identity: Identity | null;
26
initialized: boolean;
27
}
28
29
+
const initialState: StreamplaceState = {
30
url: DEFAULT_URL,
31
identity: null,
32
initialized: false,
33
};
34
35
+
export const streamplaceSlice = createAppSlice({
36
+
name: "streamplace",
37
initialState,
38
reducers: (create) => ({
39
initialize: create.asyncThunk(
40
async (_, { getState }) => {
41
+
let url = await Storage.getItem("streamplaceUrl");
42
if (!url) {
43
url = DEFAULT_URL;
44
}
···
63
),
64
65
setURL: create.reducer((state, action: { payload: string }) => {
66
+
Storage.setItem("streamplaceUrl", action.payload).catch((err) => {
67
console.error("setURL error", err);
68
});
69
return {
···
74
75
getIdentity: create.asyncThunk(
76
async (_, { getState }) => {
77
+
const { streamplace } = getState() as {
78
+
streamplace: StreamplaceState;
79
};
80
+
const res = await fetch(`${streamplace.url}/api/identity`);
81
return await res.json();
82
},
83
{
···
112
},
113
{ getState, dispatch },
114
) => {
115
+
let { streamplace } = getState() as {
116
+
streamplace: StreamplaceState;
117
};
118
+
if (!streamplace.identity) {
119
await dispatch(getIdentity());
120
}
121
+
({ streamplace } = getState() as {
122
+
streamplace: StreamplaceState;
123
});
124
+
if (!streamplace.identity) {
125
throw new Error("No identity");
126
}
127
const message = {
···
137
};
138
const signature = await signTypedData(toSign);
139
const res = await fetch(
140
+
`${streamplace.url}/api/identity/${streamplace.identity.id}`,
141
{
142
method: "PUT",
143
body: JSON.stringify({
···
169
}),
170
171
selectors: {
172
+
selectStreamplace: (streamplace) => streamplace,
173
},
174
});
175
176
// Action creators are generated for each case reducer function.
177
export const { getIdentity, putIdentity, setURL, initialize } =
178
+
streamplaceSlice.actions;
179
+
export const { selectStreamplace } = streamplaceSlice.selectors;
+1
-1
js/app/features/bluesky/blueskyProvider.tsx
+1
-1
js/app/features/bluesky/blueskyProvider.tsx
+6
-6
js/app/features/bluesky/blueskySlice.tsx
+6
-6
js/app/features/bluesky/blueskySlice.tsx
···
1
import { Agent } from "@atproto/api";
2
import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs";
3
import { OAuthSession } from "@atproto/oauth-client";
4
-
import { AquareumState } from "features/aquareum/aquareumSlice";
5
import { openLoginLink } from "features/platform/platformSlice";
6
import Storage from "storage";
7
import { createAppSlice } from "../../hooks/createSlice";
8
-
import createOAuthClient, { AquareumOAuthClient } from "./oauthClient";
9
import { Secp256k1Keypair, bytesToMultibase } from "@atproto/crypto";
10
import { privateKeyToAccount } from "viem/accounts";
11
import { StreamKey } from "features/base/baseSlice";
···
17
oauthSession: null | OAuthSession;
18
pdsAgent: null | Agent;
19
profiles: { [key: string]: ProfileViewDetailed };
20
-
client: null | AquareumOAuthClient;
21
login: {
22
loading: boolean;
23
error: null | string;
···
65
reducers: (create) => ({
66
loadOAuthClient: create.asyncThunk(
67
async (_, { getState }) => {
68
-
const { aquareum } = getState() as { aquareum: AquareumState };
69
-
const client = await createOAuthClient(aquareum.url);
70
let initResult = await client.init();
71
return { client, initResult };
72
},
···
312
];
313
const record = {
314
text: content,
315
-
"tv.aquareum.key": signingKey,
316
facets,
317
};
318
return await bluesky.pdsAgent.post(record);
···
1
import { Agent } from "@atproto/api";
2
import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs";
3
import { OAuthSession } from "@atproto/oauth-client";
4
+
import { StreamplaceState } from "features/streamplace/streamplaceSlice";
5
import { openLoginLink } from "features/platform/platformSlice";
6
import Storage from "storage";
7
import { createAppSlice } from "../../hooks/createSlice";
8
+
import createOAuthClient, { StreamplaceOAuthClient } from "./oauthClient";
9
import { Secp256k1Keypair, bytesToMultibase } from "@atproto/crypto";
10
import { privateKeyToAccount } from "viem/accounts";
11
import { StreamKey } from "features/base/baseSlice";
···
17
oauthSession: null | OAuthSession;
18
pdsAgent: null | Agent;
19
profiles: { [key: string]: ProfileViewDetailed };
20
+
client: null | StreamplaceOAuthClient;
21
login: {
22
loading: boolean;
23
error: null | string;
···
65
reducers: (create) => ({
66
loadOAuthClient: create.asyncThunk(
67
async (_, { getState }) => {
68
+
const { streamplace } = getState() as { streamplace: StreamplaceState };
69
+
const client = await createOAuthClient(streamplace.url);
70
let initResult = await client.init();
71
return { client, initResult };
72
},
···
312
];
313
const record = {
314
text: content,
315
+
"place.stream.key": signingKey,
316
facets,
317
};
318
return await bluesky.pdsAgent.post(record);
+11
-9
js/app/features/bluesky/oauthClient.tsx
+11
-9
js/app/features/bluesky/oauthClient.tsx
···
6
import Constants from "expo-constants";
7
import { Platform } from "react-native";
8
9
-
export type AquareumOAuthClient = Omit<
10
ReactNativeOAuthClient,
11
"keyset" | "serverFactory" | "jwks"
12
>;
13
14
export default async function createOAuthClient(
15
-
aquareumUrl: string,
16
-
): Promise<AquareumOAuthClient> {
17
-
if (!aquareumUrl) {
18
-
throw new Error("aquareumUrl is required");
19
}
20
let meta: ClientMetadata;
21
if (
22
-
aquareumUrl.startsWith("http://localhost") ||
23
-
aquareumUrl.startsWith("http://127.0.0.1")
24
) {
25
const isWeb = Platform.OS === "web";
26
-
const u = new URL(aquareumUrl);
27
let hostname = u.hostname;
28
if (hostname == "localhost") {
29
hostname = "127.0.0.1";
···
58
dpop_bound_access_tokens: true,
59
};
60
} else {
61
-
const res = await fetch(`${aquareumUrl}/api/atproto-oauth/${Platform.OS}`);
62
meta = await res.json();
63
}
64
clientMetadataSchema.parse(meta);
···
6
import Constants from "expo-constants";
7
import { Platform } from "react-native";
8
9
+
export type StreamplaceOAuthClient = Omit<
10
ReactNativeOAuthClient,
11
"keyset" | "serverFactory" | "jwks"
12
>;
13
14
export default async function createOAuthClient(
15
+
streamplaceUrl: string,
16
+
): Promise<StreamplaceOAuthClient> {
17
+
if (!streamplaceUrl) {
18
+
throw new Error("streamplaceUrl is required");
19
}
20
let meta: ClientMetadata;
21
if (
22
+
streamplaceUrl.startsWith("http://localhost") ||
23
+
streamplaceUrl.startsWith("http://127.0.0.1")
24
) {
25
const isWeb = Platform.OS === "web";
26
+
const u = new URL(streamplaceUrl);
27
let hostname = u.hostname;
28
if (hostname == "localhost") {
29
hostname = "127.0.0.1";
···
58
dpop_bound_access_tokens: true,
59
};
60
} else {
61
+
const res = await fetch(
62
+
`${streamplaceUrl}/api/atproto-oauth/${Platform.OS}`,
63
+
);
64
meta = await res.json();
65
}
66
clientMetadataSchema.parse(meta);
+36
js/app/features/streamplace/streamplaceProvider.tsx
+36
js/app/features/streamplace/streamplaceProvider.tsx
···
···
1
+
import { createContext, useEffect } from "react";
2
+
import { DEFAULT_URL, initialize, selectStreamplace } from "./streamplaceSlice";
3
+
import { useAppDispatch, useAppSelector } from "store/hooks";
4
+
import Loading from "components/loading/loading";
5
+
import { View, Text } from "tamagui";
6
+
7
+
export const StreamplaceContext = createContext({
8
+
url: DEFAULT_URL,
9
+
});
10
+
11
+
export default function StreamplaceProvider({
12
+
children,
13
+
}: {
14
+
children: React.ReactNode;
15
+
}): React.ReactElement {
16
+
const streamplace = useAppSelector(selectStreamplace);
17
+
const dispatch = useAppDispatch();
18
+
useEffect(() => {
19
+
if (!streamplace.initialized) {
20
+
dispatch(initialize());
21
+
}
22
+
}, [streamplace.initialized]);
23
+
if (!streamplace.initialized) {
24
+
return (
25
+
<View f={1}>
26
+
<Text>StreamplaceProvider loading...</Text>
27
+
<Loading />
28
+
</View>
29
+
);
30
+
}
31
+
return (
32
+
<StreamplaceContext.Provider value={{ url: streamplace.url }}>
33
+
{children}
34
+
</StreamplaceContext.Provider>
35
+
);
36
+
}
+3
-3
js/app/hooks/platform/platform.mobile.tsx
+3
-3
js/app/hooks/platform/platform.mobile.tsx
···
38
}
39
40
(async () => {
41
-
if (typeof process.env.EXPO_PUBLIC_AQUAREUM_URL !== "string") {
42
-
console.log("process.env.EXPO_PUBLIC_AQUAREUM_URL undefined!");
43
return;
44
}
45
try {
46
const token = await x.getToken();
47
const res = await fetch(
48
-
`${process.env.EXPO_PUBLIC_AQUAREUM_URL}/api/notification`,
49
{
50
method: "POST",
51
headers: {
···
38
}
39
40
(async () => {
41
+
if (typeof process.env.EXPO_PUBLIC_STREAMPLACE_URL !== "string") {
42
+
console.log("process.env.EXPO_PUBLIC_STREAMPLACE_URL undefined!");
43
return;
44
}
45
try {
46
const token = await x.getToken();
47
const res = await fetch(
48
+
`${process.env.EXPO_PUBLIC_STREAMPLACE_URL}/api/notification`,
49
{
50
method: "POST",
51
headers: {
-6
js/app/hooks/useAquareumNode.tsx
-6
js/app/hooks/useAquareumNode.tsx
+6
js/app/hooks/useStreamplaceNode.tsx
+6
js/app/hooks/useStreamplaceNode.tsx
+2
-2
js/app/hooks/useWallet.tsx
+2
-2
js/app/hooks/useWallet.tsx
···
44
const queryClient = new QueryClient();
45
46
const defaultConfig = getDefaultConfig({
47
-
appName: "Aquareum",
48
-
appUrl: "https://aquareum.tv",
49
projectId: "32c8489fbff0b10e2e011b36c36b4466",
50
chains: [mainnet, polygon, optimism, arbitrum, base],
51
ssr: true, // If your dApp uses server side rendering (SSR)
···
44
const queryClient = new QueryClient();
45
46
const defaultConfig = getDefaultConfig({
47
+
appName: "Streamplace",
48
+
appUrl: "https://stream.place",
49
projectId: "32c8489fbff0b10e2e011b36c36b4466",
50
chains: [mainnet, polygon, optimism, arbitrum, base],
51
ssr: true, // If your dApp uses server side rendering (SSR)
+2
-2
js/app/package.json
+2
-2
js/app/package.json
···
1
{
2
-
"name": "aquareum",
3
"main": "./src/entrypoint.tsx",
4
"version": "0.2.4",
5
"runtimeVersion": "0.2.3",
···
19
"postinstall": "which pod && yarn run postinstall-ios || echo 'not a mac, not installing pods'",
20
"postinstall-ios": "cd ios && pod install && yarn run find-node",
21
"find-node": "node -p '`NODE_BINARY=${process.argv[0]}`' > ios/.xcode.env.local",
22
-
"code-signing-dev": "mkdir -p code-signing-dev/keys code-signing-dev/certs && expo-updates codesigning:generate --key-output-directory code-signing-dev/keys --certificate-output-directory code-signing-dev/certs --certificate-validity-duration-years 10 --certificate-common-name 'Aquareum'"
23
},
24
"jest": {
25
"preset": "jest-expo"
···
1
{
2
+
"name": "streamplace",
3
"main": "./src/entrypoint.tsx",
4
"version": "0.2.4",
5
"runtimeVersion": "0.2.3",
···
19
"postinstall": "which pod && yarn run postinstall-ios || echo 'not a mac, not installing pods'",
20
"postinstall-ios": "cd ios && pod install && yarn run find-node",
21
"find-node": "node -p '`NODE_BINARY=${process.argv[0]}`' > ios/.xcode.env.local",
22
+
"code-signing-dev": "mkdir -p code-signing-dev/keys code-signing-dev/certs && expo-updates codesigning:generate --key-output-directory code-signing-dev/keys --certificate-output-directory code-signing-dev/certs --certificate-validity-duration-years 10 --certificate-common-name 'Streamplace'"
23
},
24
"jest": {
25
"preset": "jest-expo"
+1
-1
js/app/public/index.html
+1
-1
js/app/public/index.html
+7
-7
js/app/src/router.tsx
+7
-7
js/app/src/router.tsx
···
50
const Stack = createNativeStackNavigator();
51
52
const linking: LinkingOptions<ReactNavigation.RootParamList> = {
53
-
prefixes: ["tv.aquareum://", "tv.aquareum.dev://"],
54
config: {
55
screens: {
56
Home: {
···
136
}
137
return (
138
<Provider linking={linking}>
139
-
<AquareumDrawer />
140
</Provider>
141
);
142
}
143
144
-
export function AquareumDrawer() {
145
const theme = useTheme();
146
const { isWeb, isElectron } = usePlatform();
147
const navigation = useNavigation();
···
180
options={{
181
drawerIcon: () => <Home />,
182
drawerLabel: () => <Text>Home</Text>,
183
-
headerTitle: "Aquareum",
184
headerShown: isWeb,
185
-
title: "Aquareum",
186
}}
187
listeners={{
188
drawerItemPress: (e) => {
···
298
<Stack.Screen
299
name="StreamList"
300
component={HomeScreen}
301
-
options={{ headerTitle: "Aquareum", title: "Aquareum" }}
302
/>
303
<Stack.Screen
304
name="Stream"
305
component={StreamScreen}
306
options={{
307
headerTitle: "Stream",
308
-
title: "Aquareum Stream",
309
}}
310
/>
311
</Stack.Navigator>
···
50
const Stack = createNativeStackNavigator();
51
52
const linking: LinkingOptions<ReactNavigation.RootParamList> = {
53
+
prefixes: ["place.stream://", "place.stream.dev://"],
54
config: {
55
screens: {
56
Home: {
···
136
}
137
return (
138
<Provider linking={linking}>
139
+
<StreamplaceDrawer />
140
</Provider>
141
);
142
}
143
144
+
export function StreamplaceDrawer() {
145
const theme = useTheme();
146
const { isWeb, isElectron } = usePlatform();
147
const navigation = useNavigation();
···
180
options={{
181
drawerIcon: () => <Home />,
182
drawerLabel: () => <Text>Home</Text>,
183
+
headerTitle: "Streamplace",
184
headerShown: isWeb,
185
+
title: "Streamplace",
186
}}
187
listeners={{
188
drawerItemPress: (e) => {
···
298
<Stack.Screen
299
name="StreamList"
300
component={HomeScreen}
301
+
options={{ headerTitle: "Streamplace", title: "Streamplace" }}
302
/>
303
<Stack.Screen
304
name="Stream"
305
component={StreamScreen}
306
options={{
307
headerTitle: "Stream",
308
+
title: "Streamplace Stream",
309
}}
310
/>
311
</Stack.Navigator>
+1
-1
js/app/src/screens/stream-key.tsx
+1
-1
js/app/src/screens/stream-key.tsx
+2
-2
js/app/store/store.tsx
+2
-2
js/app/store/store.tsx
···
1
import type { Action, ThunkAction } from "@reduxjs/toolkit";
2
import { combineSlices, configureStore } from "@reduxjs/toolkit";
3
import { setupListeners } from "@reduxjs/toolkit/query";
4
-
import { aquareumSlice } from "features/aquareum/aquareumSlice";
5
import { baseSlice } from "features/base/baseSlice";
6
import { blueskySlice } from "features/bluesky/blueskySlice";
7
import { platformSlice } from "features/platform/platformSlice";
···
9
10
const rootReducer = combineSlices(
11
blueskySlice,
12
-
aquareumSlice,
13
platformSlice,
14
playerSlice,
15
baseSlice,
···
1
import type { Action, ThunkAction } from "@reduxjs/toolkit";
2
import { combineSlices, configureStore } from "@reduxjs/toolkit";
3
import { setupListeners } from "@reduxjs/toolkit/query";
4
+
import { streamplaceSlice } from "features/streamplace/streamplaceSlice";
5
import { baseSlice } from "features/base/baseSlice";
6
import { blueskySlice } from "features/bluesky/blueskySlice";
7
import { platformSlice } from "features/platform/platformSlice";
···
9
10
const rootReducer = combineSlices(
11
blueskySlice,
12
+
streamplaceSlice,
13
platformSlice,
14
playerSlice,
15
baseSlice,
+2
-2
js/app/tamagui.config.ts
+2
-2
js/app/tamagui.config.ts
+5
-5
js/desktop/README.md
+5
-5
js/desktop/README.md
···
1
-
# Aquareum Desktop
2
3
## `yarn run start`
4
5
-
Boot up Aquareum Desktop for development. Two environment variable options:
6
7
-
- `AQD_SKIP_NODE`: (default `false`): Skip booting up an Aquareum node from
8
within the app so you can just test the app against the node you're already
9
running locally.
10
11
-
- `AQD_NODE_FRONTEND`: (default `false`): Use frontend bundled with the Aquareum
12
-
node instead of the dev server on `http://localhost:8081`.
···
1
+
# Streamplace Desktop
2
3
## `yarn run start`
4
5
+
Boot up Streamplace Desktop for development. Two environment variable options:
6
7
+
- `AQD_SKIP_NODE`: (default `false`): Skip booting up an Streamplace node from
8
within the app so you can just test the app against the node you're already
9
running locally.
10
11
+
- `AQD_NODE_FRONTEND`: (default `false`): Use frontend bundled with the
12
+
Streamplace node instead of the dev server on `http://localhost:8081`.
js/desktop/assets/images/aquareum-logo.icns
js/desktop/assets/images/streamplace-logo.icns
js/desktop/assets/images/aquareum-logo.icns
js/desktop/assets/images/streamplace-logo.icns
js/desktop/assets/images/aquareum-logo.ico
js/desktop/assets/images/streamplace-logo.ico
js/desktop/assets/images/aquareum-logo.ico
js/desktop/assets/images/streamplace-logo.ico
js/desktop/assets/images/aquareum-logo.png
js/desktop/assets/images/streamplace-logo.png
js/desktop/assets/images/aquareum-logo.png
js/desktop/assets/images/streamplace-logo.png
+11
-11
js/desktop/forge.config.ts
+11
-11
js/desktop/forge.config.ts
···
40
41
const packagerConfig: ForgePackagerOptions = {
42
asar: true,
43
-
name: "Aquareum",
44
appVersion: version,
45
buildVersion: version,
46
-
icon: "./assets/images/aquareum-logo",
47
-
extraResource: ["./assets/images/aquareum-logo.png"],
48
};
49
50
const config: ForgeConfig = {
···
59
if (architecture === "x64") {
60
architecture = "amd64";
61
}
62
-
let binary = `../../build-${platform}-${architecture}/aquareum`;
63
if (platform === "windows") {
64
binary += ".exe";
65
}
···
90
makers: [
91
new MakerSquirrel({
92
iconUrl:
93
-
"https://git.aquareum.tv/-/project/1/uploads/2e5899ffd2b4799ce661cf9b8675e610/aquareum-logo-256.ico",
94
-
setupIcon: "./assets/images/aquareum-logo.ico",
95
}),
96
new MakerDMG(
97
{
98
-
icon: "./assets/images/aquareum-logo.icns",
99
-
appPath: "./Aquareum.app",
100
},
101
["darwin"],
102
),
···
104
// new MakerRpm({}),
105
new MakerAppImage({
106
options: {
107
-
bin: "Aquareum",
108
-
icon: "./assets/images/aquareum-logo.png",
109
},
110
}),
111
],
···
146
accessKeyId: "minioadmin",
147
secretAccessKey: "minioadmin",
148
public: true,
149
-
bucket: "aquareum",
150
region: "unused",
151
}),
152
],
···
40
41
const packagerConfig: ForgePackagerOptions = {
42
asar: true,
43
+
name: "Streamplace",
44
appVersion: version,
45
buildVersion: version,
46
+
icon: "./assets/images/streamplace-logo",
47
+
extraResource: ["./assets/images/streamplace-logo.png"],
48
};
49
50
const config: ForgeConfig = {
···
59
if (architecture === "x64") {
60
architecture = "amd64";
61
}
62
+
let binary = `../../build-${platform}-${architecture}/streamplace`;
63
if (platform === "windows") {
64
binary += ".exe";
65
}
···
90
makers: [
91
new MakerSquirrel({
92
iconUrl:
93
+
"https://git.aquareum.tv/-/project/1/uploads/2e5899ffd2b4799ce661cf9b8675e610/streamplace-logo-256.ico",
94
+
setupIcon: "./assets/images/streamplace-logo.ico",
95
}),
96
new MakerDMG(
97
{
98
+
icon: "./assets/images/streamplace-logo.icns",
99
+
appPath: "./Streamplace.app",
100
},
101
["darwin"],
102
),
···
104
// new MakerRpm({}),
105
new MakerAppImage({
106
options: {
107
+
bin: "Streamplace",
108
+
icon: "./assets/images/streamplace-logo.png",
109
},
110
}),
111
],
···
146
accessKeyId: "minioadmin",
147
secretAccessKey: "minioadmin",
148
public: true,
149
+
bucket: "streamplace",
150
region: "unused",
151
}),
152
],
+5
-5
js/desktop/package.json
+5
-5
js/desktop/package.json
···
1
{
2
-
"name": "aquareum-desktop",
3
-
"productName": "aquareum-desktop",
4
"version": "0.2.4",
5
-
"description": "Aquareum Desktop Application",
6
"main": ".webpack/main",
7
"scripts": {
8
"start": "electron-forge start \"$@\" | cat",
···
43
},
44
"keywords": [],
45
"author": {
46
-
"name": "Aquareum Inc.",
47
-
"email": "support@aquareum.tv"
48
},
49
"license": "MIT",
50
"dependencies": {
···
1
{
2
+
"name": "streamplace-desktop",
3
+
"productName": "streamplace-desktop",
4
"version": "0.2.4",
5
+
"description": "Streamplace Desktop Application",
6
"main": ".webpack/main",
7
"scripts": {
8
"start": "electron-forge start \"$@\" | cat",
···
43
},
44
"keywords": [],
45
"author": {
46
+
"name": "Streamplace Inc.",
47
+
"email": "support@stream.place"
48
},
49
"license": "MIT",
50
"dependencies": {
+1
-1
js/desktop/src/env.ts
+1
-1
js/desktop/src/env.ts
+3
-2
js/desktop/src/index.ts
+3
-2
js/desktop/src/index.ts
+4
-4
js/desktop/src/node.ts
+4
-4
js/desktop/src/node.ts
···
7
8
const findExe = async (): Promise<string> => {
9
const { isDev } = getEnv();
10
-
let fname = "aquareum";
11
let exe: string;
12
let platform = os.platform() as string;
13
let architecture = os.arch() as string;
···
20
}
21
let binfolder = `build-${platform}-${architecture}`;
22
if (isDev) {
23
-
// theoretically cwd is aquareum/js/desktop:
24
exe = resolve(process.cwd(), "..", "..", binfolder, fname);
25
} else {
26
exe = resolve(process.resourcesPath, fname);
···
29
await access(exe, constants.F_OK);
30
} catch (e) {
31
throw new Error(
32
-
`could not find aquareum node binary at ${exe}: ${e.message}`,
33
);
34
}
35
return exe;
···
98
99
if (attempts >= maxAttempts) {
100
clearInterval(intervalId);
101
-
reject(new Error("aquareum did not boot up in time"));
102
}
103
}, interval);
104
});
···
7
8
const findExe = async (): Promise<string> => {
9
const { isDev } = getEnv();
10
+
let fname = "streamplace";
11
let exe: string;
12
let platform = os.platform() as string;
13
let architecture = os.arch() as string;
···
20
}
21
let binfolder = `build-${platform}-${architecture}`;
22
if (isDev) {
23
+
// theoretically cwd is streamplace/js/desktop:
24
exe = resolve(process.cwd(), "..", "..", binfolder, fname);
25
} else {
26
exe = resolve(process.resourcesPath, fname);
···
29
await access(exe, constants.F_OK);
30
} catch (e) {
31
throw new Error(
32
+
`could not find streamplace node binary at ${exe}: ${e.message}`,
33
);
34
}
35
return exe;
···
98
99
if (attempts >= maxAttempts) {
100
clearInterval(intervalId);
101
+
reject(new Error("streamplace did not boot up in time"));
102
}
103
}, interval);
104
});
+3
-3
js/desktop/src/tests/sync-test.ts
+3
-3
js/desktop/src/tests/sync-test.ts
···
15
webPreferences: {
16
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
17
},
18
-
title: "aquareum-sync-test",
19
// titleBarStyle: "hidden",
20
// titleBarOverlay: true,
21
});
···
51
webPreferences: {
52
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
53
},
54
-
title: "aquareum-sync-stream",
55
// titleBarStyle: "hidden",
56
// titleBarOverlay: true,
57
});
···
75
webPreferences: {
76
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
77
},
78
-
title: "aquareum-sync-playback",
79
// titleBarStyle: "hidden",
80
// titleBarOverlay: true,
81
});
···
15
webPreferences: {
16
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
17
},
18
+
title: "streamplace-sync-test",
19
// titleBarStyle: "hidden",
20
// titleBarOverlay: true,
21
});
···
51
webPreferences: {
52
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
53
},
54
+
title: "streamplace-sync-stream",
55
// titleBarStyle: "hidden",
56
// titleBarOverlay: true,
57
});
···
75
webPreferences: {
76
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
77
},
78
+
title: "streamplace-sync-playback",
79
// titleBarStyle: "hidden",
80
// titleBarOverlay: true,
81
});
+1
-1
js/desktop/src/tests/test-runner.ts
+1
-1
js/desktop/src/tests/test-runner.ts
+3
-1
js/desktop/src/updater.ts
+3
-1
js/desktop/src/updater.ts
+3
-3
js/desktop/src/window.ts
+3
-3
js/desktop/src/window.ts
···
6
const { isDev } = getEnv();
7
let logoFile: string;
8
if (isDev) {
9
-
// theoretically cwd is aquareum/js/desktop:
10
-
logoFile = resolve(process.cwd(), "assets", "aquareum-logo.png");
11
} else {
12
-
logoFile = resolve(process.resourcesPath, "aquareum-logo.png");
13
}
14
const window = new BrowserWindow({
15
height: 600,
···
6
const { isDev } = getEnv();
7
let logoFile: string;
8
if (isDev) {
9
+
// theoretically cwd is streamplace/js/desktop:
10
+
logoFile = resolve(process.cwd(), "assets", "streamplace-logo.png");
11
} else {
12
+
logoFile = resolve(process.resourcesPath, "streamplace-logo.png");
13
}
14
const window = new BrowserWindow({
15
height: 600,
+29
-29
meson.build
+29
-29
meson.build
···
1
project(
2
-
'aquareum',
3
'c',
4
'cpp',
5
default_options: {
···
34
version_cmd = run_command(prog_go, 'run', 'pkg/config/git/git.go', '-v', check: true)
35
version = version_cmd.stdout().strip()
36
37
-
aquareum_go = custom_target(
38
-
'aquareum.go',
39
-
input: 'cmd/libaquareum/aquareum.go',
40
-
output: 'aquareum.go',
41
command: ['cp', '@INPUT@', '@OUTPUT@'],
42
)
43
···
74
)
75
c2pa_go_dep = c2pa_go_proj.get_variable('c2pa_go_dep')
76
77
-
aquareum_deps = []
78
# if host_machine.system() == 'linux'
79
# mistserver_proj = subproject(
80
# 'mistserver',
···
83
# },
84
# )
85
# mistserver = mistserver_proj.get_variable('libmistserver_dep')
86
-
# aquareum_deps += mistserver
87
# endif
88
89
ffmpeg_opts = {
···
182
)
183
avformat = ffmpeg_proj.get_variable('libavformat_dep')
184
avfilter = ffmpeg_proj.get_variable('libavfilter_dep')
185
-
aquareum_deps += [avformat, avfilter]
186
187
gstreamer_proj = subproject(
188
'gstreamer-full',
···
190
)
191
192
gst_full_dep = gstreamer_proj.get_variable('gst_full_dep')
193
-
aquareum_deps += [
194
gst_full_dep,
195
dependency('gio-2.0'),
196
dependency('gstreamer-controller-1.0'),
···
199
dependency('gstplayback'),
200
]
201
202
-
libaquareum = custom_target(
203
-
'libaquareum',
204
-
input: [aquareum_go, flags],
205
-
output: ['aquareum.a', 'aquareum.h'],
206
command: [
207
prog_go,
208
'build',
···
216
)
217
218
if host_machine.system() == 'darwin'
219
-
aquareum_deps += [dependency('appleframeworks', modules: ['CoreFoundation', 'Security'])]
220
endif
221
if host_machine.system() == 'windows'
222
add_project_link_arguments(
···
234
235
pkg = import('pkgconfig')
236
pkg.generate(
237
-
name: 'aquareumdeps',
238
-
libraries: [aquareum_deps, c2pa_go_dep],
239
-
description: 'all aquareum dependencies bundled for easy inclusion',
240
)
241
242
-
aquareum = executable(
243
-
'aquareum',
244
-
['cmd/aquareum/aquareum.c', libaquareum],
245
dependencies: [
246
-
aquareum_deps,
247
],
248
link_with: [c2pa_go_dep],
249
)
···
252
test(
253
'go-tests',
254
prog_go,
255
-
depends: [aquareum],
256
env: env,
257
verbose: true,
258
timeout: 0,
···
266
267
if host_machine.system() == 'windows'
268
prog_zip = find_program('zip')
269
-
archive_name = 'aquareum-' + version + '-' + GOOS + '-' + GOARCH + '.zip'
270
custom_target(
271
'archive',
272
-
input: [aquareum],
273
-
output: ['aquareum.zip'],
274
command: [prog_zip, '../bin/' + archive_name, '@INPUT@'],
275
install: true,
276
install_dir: './bin',
···
278
)
279
else
280
prog_tar = find_program('tar')
281
-
# archive_name = aquareum-$(VERSION)-$$GOOS-$$GOARCH.tar.gz
282
-
archive_name = 'aquareum-' + version + '-' + GOOS + '-' + GOARCH + '.tar.gz'
283
custom_target(
284
'archive',
285
-
input: [aquareum],
286
-
output: ['aquareum.tar.gz'],
287
command: [prog_tar, '-czvf', '../bin/' + archive_name, '@INPUT@'],
288
install: true,
289
install_dir: './bin',
···
1
project(
2
+
'streamplace',
3
'c',
4
'cpp',
5
default_options: {
···
34
version_cmd = run_command(prog_go, 'run', 'pkg/config/git/git.go', '-v', check: true)
35
version = version_cmd.stdout().strip()
36
37
+
streamplace_go = custom_target(
38
+
'streamplace.go',
39
+
input: 'cmd/libstreamplace/streamplace.go',
40
+
output: 'streamplace.go',
41
command: ['cp', '@INPUT@', '@OUTPUT@'],
42
)
43
···
74
)
75
c2pa_go_dep = c2pa_go_proj.get_variable('c2pa_go_dep')
76
77
+
streamplace_deps = []
78
# if host_machine.system() == 'linux'
79
# mistserver_proj = subproject(
80
# 'mistserver',
···
83
# },
84
# )
85
# mistserver = mistserver_proj.get_variable('libmistserver_dep')
86
+
# streamplace_deps += mistserver
87
# endif
88
89
ffmpeg_opts = {
···
182
)
183
avformat = ffmpeg_proj.get_variable('libavformat_dep')
184
avfilter = ffmpeg_proj.get_variable('libavfilter_dep')
185
+
streamplace_deps += [avformat, avfilter]
186
187
gstreamer_proj = subproject(
188
'gstreamer-full',
···
190
)
191
192
gst_full_dep = gstreamer_proj.get_variable('gst_full_dep')
193
+
streamplace_deps += [
194
gst_full_dep,
195
dependency('gio-2.0'),
196
dependency('gstreamer-controller-1.0'),
···
199
dependency('gstplayback'),
200
]
201
202
+
libstreamplace = custom_target(
203
+
'libstreamplace',
204
+
input: [streamplace_go, flags],
205
+
output: ['streamplace.a', 'streamplace.h'],
206
command: [
207
prog_go,
208
'build',
···
216
)
217
218
if host_machine.system() == 'darwin'
219
+
streamplace_deps += [dependency('appleframeworks', modules: ['CoreFoundation', 'Security'])]
220
endif
221
if host_machine.system() == 'windows'
222
add_project_link_arguments(
···
234
235
pkg = import('pkgconfig')
236
pkg.generate(
237
+
name: 'streamplacedeps',
238
+
libraries: [streamplace_deps, c2pa_go_dep],
239
+
description: 'all streamplace dependencies bundled for easy inclusion',
240
)
241
242
+
streamplace = executable(
243
+
'streamplace',
244
+
['cmd/streamplace/streamplace.c', libstreamplace],
245
dependencies: [
246
+
streamplace_deps,
247
],
248
link_with: [c2pa_go_dep],
249
)
···
252
test(
253
'go-tests',
254
prog_go,
255
+
depends: [streamplace],
256
env: env,
257
verbose: true,
258
timeout: 0,
···
266
267
if host_machine.system() == 'windows'
268
prog_zip = find_program('zip')
269
+
archive_name = 'streamplace-' + version + '-' + GOOS + '-' + GOARCH + '.zip'
270
custom_target(
271
'archive',
272
+
input: [streamplace],
273
+
output: ['streamplace.zip'],
274
command: [prog_zip, '../bin/' + archive_name, '@INPUT@'],
275
install: true,
276
install_dir: './bin',
···
278
)
279
else
280
prog_tar = find_program('tar')
281
+
# archive_name = streamplace-$(VERSION)-$$GOOS-$$GOARCH.tar.gz
282
+
archive_name = 'streamplace-' + version + '-' + GOOS + '-' + GOARCH + '.tar.gz'
283
custom_target(
284
'archive',
285
+
input: [streamplace],
286
+
output: ['streamplace.tar.gz'],
287
command: [prog_tar, '-czvf', '../bin/' + archive_name, '@INPUT@'],
288
install: true,
289
install_dir: './bin',
+2
-2
package.json
+2
-2
package.json
···
1
{
2
-
"name": "aquareum-monorepo",
3
"private": true,
4
"version": "0.0.0-monorepo",
5
"description": "The video layer for everything.",
···
17
"desktop": "cd js/desktop && yarn run \"$@\""
18
},
19
"keywords": [],
20
-
"author": "Aquareum",
21
"license": "MIT",
22
"devDependencies": {
23
"husky": "^9.1.6",
···
1
{
2
+
"name": "streamplace-monorepo",
3
"private": true,
4
"version": "0.0.0-monorepo",
5
"description": "The video layer for everything.",
···
17
"desktop": "cd js/desktop && yarn run \"$@\""
18
},
19
"keywords": [],
20
+
"author": "Streamplace",
21
"license": "MIT",
22
"devDependencies": {
23
"husky": "^9.1.6",
+34
-34
pkg/api/api.go
+34
-34
pkg/api/api.go
···
21
"github.com/rs/cors"
22
sloghttp "github.com/samber/slog-http"
23
24
-
"aquareum.tv/aquareum/js/app"
25
-
"aquareum.tv/aquareum/pkg/atproto"
26
-
"aquareum.tv/aquareum/pkg/config"
27
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712"
28
-
apierrors "aquareum.tv/aquareum/pkg/errors"
29
-
"aquareum.tv/aquareum/pkg/log"
30
-
"aquareum.tv/aquareum/pkg/media"
31
-
"aquareum.tv/aquareum/pkg/mist/mistconfig"
32
-
"aquareum.tv/aquareum/pkg/model"
33
-
"aquareum.tv/aquareum/pkg/notifications"
34
-
v0 "aquareum.tv/aquareum/pkg/schema/v0"
35
)
36
37
-
type AquareumAPI struct {
38
CLI *config.CLI
39
Model model.Model
40
Updater *Updater
···
47
Aliases map[string]string
48
}
49
50
-
func MakeAquareumAPI(cli *config.CLI, mod model.Model, signer *eip712.EIP712Signer, noter notifications.FirebaseNotifier, mm *media.MediaManager, ms *media.MediaSigner) (*AquareumAPI, error) {
51
updater, err := PrepareUpdater(cli)
52
if err != nil {
53
return nil, err
54
}
55
-
a := &AquareumAPI{CLI: cli,
56
Model: mod,
57
Updater: updater,
58
Signer: signer,
···
91
return fs.FileSystem.Open("index.html")
92
}
93
94
-
func (a *AquareumAPI) Handler(ctx context.Context) (http.Handler, error) {
95
router := httprouter.New()
96
apiRouter := httprouter.New()
97
apiRouter.HandlerFunc("POST", "/api/notification", a.HandleNotification(ctx))
···
171
}
172
}
173
174
-
func (a *AquareumAPI) MistProxyHandler(ctx context.Context, tmpl string) httprouter.Handle {
175
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
176
if !a.CLI.HasMist() {
177
apierrors.WriteHTTPNotImplemented(w, "Playback only on the Linux version for now", nil)
···
214
}
215
}
216
217
-
func (a *AquareumAPI) FileHandler(ctx context.Context, fs http.Handler) http.HandlerFunc {
218
return func(w http.ResponseWriter, req *http.Request) {
219
noslash := req.URL.Path[1:]
220
ct, ok := a.Mimes[noslash]
···
225
}
226
}
227
228
-
func (a *AquareumAPI) RedirectHandler(ctx context.Context) (http.Handler, error) {
229
_, tlsPort, err := net.SplitHostPort(a.CLI.HttpsAddr)
230
if err != nil {
231
return nil, err
···
253
Token string `json:"token"`
254
}
255
256
-
func (a *AquareumAPI) HandleAPI404(ctx context.Context) http.HandlerFunc {
257
return func(w http.ResponseWriter, req *http.Request) {
258
w.WriteHeader(404)
259
}
260
}
261
262
-
func (a *AquareumAPI) HandleIdentityPUT(ctx context.Context) httprouter.Handle {
263
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
264
id := params.ByName("id")
265
if id == "" {
···
301
}
302
}
303
304
-
func (a *AquareumAPI) HandleNotification(ctx context.Context) http.HandlerFunc {
305
return func(w http.ResponseWriter, req *http.Request) {
306
payload, err := io.ReadAll(req.Body)
307
if err != nil {
···
327
}
328
}
329
330
-
func (a *AquareumAPI) HandleSegment(ctx context.Context) http.HandlerFunc {
331
return func(w http.ResponseWriter, req *http.Request) {
332
err := a.MediaManager.ValidateMP4(ctx, req.Body)
333
if err != nil {
···
338
}
339
}
340
341
-
func (a *AquareumAPI) HandlePlayerEvent(ctx context.Context) httprouter.Handle {
342
return func(w http.ResponseWriter, req *http.Request, p httprouter.Params) {
343
var event model.PlayerEventAPI
344
if err := json.NewDecoder(req.Body).Decode(&event); err != nil {
···
354
}
355
}
356
357
-
func (a *AquareumAPI) HandleRecentSegments(ctx context.Context) httprouter.Handle {
358
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
359
segs, err := a.Model.MostRecentSegments()
360
if err != nil {
···
371
}
372
}
373
374
-
func (a *AquareumAPI) HandleLiveUsers(ctx context.Context) httprouter.Handle {
375
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
376
repos, err := a.Model.GetLiveUsers()
377
if err != nil {
···
387
}
388
}
389
390
-
func (a *AquareumAPI) HandleIdentityGET(ctx context.Context) httprouter.Handle {
391
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
392
id := a.MediaSigner.Pub.String()
393
···
406
}
407
}
408
409
-
func (a *AquareumAPI) HandleBlueskyResolve(ctx context.Context) httprouter.Handle {
410
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
411
log.Log(ctx, "got bluesky notification", "params", params)
412
key, err := atproto.SyncBlueskyRepo(ctx, params.ByName("handle"), a.Model)
413
if err != nil {
414
-
apierrors.WriteHTTPInternalServerError(w, "could not resolve aquareum key", err)
415
return
416
}
417
w.Write([]byte(key))
418
}
419
}
420
421
-
func (a *AquareumAPI) HandleATProtoOAuth(ctx context.Context) httprouter.Handle {
422
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
423
host, _, err := net.SplitHostPort(req.Host)
424
if err != nil {
···
441
}
442
}
443
444
-
func (a *AquareumAPI) ServeHTTP(ctx context.Context) error {
445
handler, err := a.Handler(ctx)
446
if err != nil {
447
return err
···
453
})
454
}
455
456
-
func (a *AquareumAPI) ServeHTTPRedirect(ctx context.Context) error {
457
handler, err := a.RedirectHandler(ctx)
458
if err != nil {
459
return err
···
465
})
466
}
467
468
-
func (a *AquareumAPI) ServeHTTPS(ctx context.Context) error {
469
handler, err := a.Handler(ctx)
470
if err != nil {
471
return err
···
481
})
482
}
483
484
-
func (a *AquareumAPI) ServerWithShutdown(ctx context.Context, handler http.Handler, serve func(*http.Server) error) error {
485
ctx, cancel := context.WithCancel(ctx)
486
handler = gziphandler.GzipHandler(handler)
487
server := http.Server{Handler: handler}
···
500
return server.Shutdown(ctx)
501
}
502
503
-
func (a *AquareumAPI) HandleHealthz(ctx context.Context) http.HandlerFunc {
504
return func(w http.ResponseWriter, req *http.Request) {
505
w.WriteHeader(200)
506
}
···
21
"github.com/rs/cors"
22
sloghttp "github.com/samber/slog-http"
23
24
+
"stream.place/streamplace/js/app"
25
+
"stream.place/streamplace/pkg/atproto"
26
+
"stream.place/streamplace/pkg/config"
27
+
"stream.place/streamplace/pkg/crypto/signers/eip712"
28
+
apierrors "stream.place/streamplace/pkg/errors"
29
+
"stream.place/streamplace/pkg/log"
30
+
"stream.place/streamplace/pkg/media"
31
+
"stream.place/streamplace/pkg/mist/mistconfig"
32
+
"stream.place/streamplace/pkg/model"
33
+
"stream.place/streamplace/pkg/notifications"
34
+
v0 "stream.place/streamplace/pkg/schema/v0"
35
)
36
37
+
type StreamplaceAPI struct {
38
CLI *config.CLI
39
Model model.Model
40
Updater *Updater
···
47
Aliases map[string]string
48
}
49
50
+
func MakeStreamplaceAPI(cli *config.CLI, mod model.Model, signer *eip712.EIP712Signer, noter notifications.FirebaseNotifier, mm *media.MediaManager, ms *media.MediaSigner) (*StreamplaceAPI, error) {
51
updater, err := PrepareUpdater(cli)
52
if err != nil {
53
return nil, err
54
}
55
+
a := &StreamplaceAPI{CLI: cli,
56
Model: mod,
57
Updater: updater,
58
Signer: signer,
···
91
return fs.FileSystem.Open("index.html")
92
}
93
94
+
func (a *StreamplaceAPI) Handler(ctx context.Context) (http.Handler, error) {
95
router := httprouter.New()
96
apiRouter := httprouter.New()
97
apiRouter.HandlerFunc("POST", "/api/notification", a.HandleNotification(ctx))
···
171
}
172
}
173
174
+
func (a *StreamplaceAPI) MistProxyHandler(ctx context.Context, tmpl string) httprouter.Handle {
175
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
176
if !a.CLI.HasMist() {
177
apierrors.WriteHTTPNotImplemented(w, "Playback only on the Linux version for now", nil)
···
214
}
215
}
216
217
+
func (a *StreamplaceAPI) FileHandler(ctx context.Context, fs http.Handler) http.HandlerFunc {
218
return func(w http.ResponseWriter, req *http.Request) {
219
noslash := req.URL.Path[1:]
220
ct, ok := a.Mimes[noslash]
···
225
}
226
}
227
228
+
func (a *StreamplaceAPI) RedirectHandler(ctx context.Context) (http.Handler, error) {
229
_, tlsPort, err := net.SplitHostPort(a.CLI.HttpsAddr)
230
if err != nil {
231
return nil, err
···
253
Token string `json:"token"`
254
}
255
256
+
func (a *StreamplaceAPI) HandleAPI404(ctx context.Context) http.HandlerFunc {
257
return func(w http.ResponseWriter, req *http.Request) {
258
w.WriteHeader(404)
259
}
260
}
261
262
+
func (a *StreamplaceAPI) HandleIdentityPUT(ctx context.Context) httprouter.Handle {
263
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
264
id := params.ByName("id")
265
if id == "" {
···
301
}
302
}
303
304
+
func (a *StreamplaceAPI) HandleNotification(ctx context.Context) http.HandlerFunc {
305
return func(w http.ResponseWriter, req *http.Request) {
306
payload, err := io.ReadAll(req.Body)
307
if err != nil {
···
327
}
328
}
329
330
+
func (a *StreamplaceAPI) HandleSegment(ctx context.Context) http.HandlerFunc {
331
return func(w http.ResponseWriter, req *http.Request) {
332
err := a.MediaManager.ValidateMP4(ctx, req.Body)
333
if err != nil {
···
338
}
339
}
340
341
+
func (a *StreamplaceAPI) HandlePlayerEvent(ctx context.Context) httprouter.Handle {
342
return func(w http.ResponseWriter, req *http.Request, p httprouter.Params) {
343
var event model.PlayerEventAPI
344
if err := json.NewDecoder(req.Body).Decode(&event); err != nil {
···
354
}
355
}
356
357
+
func (a *StreamplaceAPI) HandleRecentSegments(ctx context.Context) httprouter.Handle {
358
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
359
segs, err := a.Model.MostRecentSegments()
360
if err != nil {
···
371
}
372
}
373
374
+
func (a *StreamplaceAPI) HandleLiveUsers(ctx context.Context) httprouter.Handle {
375
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
376
repos, err := a.Model.GetLiveUsers()
377
if err != nil {
···
387
}
388
}
389
390
+
func (a *StreamplaceAPI) HandleIdentityGET(ctx context.Context) httprouter.Handle {
391
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
392
id := a.MediaSigner.Pub.String()
393
···
406
}
407
}
408
409
+
func (a *StreamplaceAPI) HandleBlueskyResolve(ctx context.Context) httprouter.Handle {
410
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
411
log.Log(ctx, "got bluesky notification", "params", params)
412
key, err := atproto.SyncBlueskyRepo(ctx, params.ByName("handle"), a.Model)
413
if err != nil {
414
+
apierrors.WriteHTTPInternalServerError(w, "could not resolve streamplace key", err)
415
return
416
}
417
w.Write([]byte(key))
418
}
419
}
420
421
+
func (a *StreamplaceAPI) HandleATProtoOAuth(ctx context.Context) httprouter.Handle {
422
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
423
host, _, err := net.SplitHostPort(req.Host)
424
if err != nil {
···
441
}
442
}
443
444
+
func (a *StreamplaceAPI) ServeHTTP(ctx context.Context) error {
445
handler, err := a.Handler(ctx)
446
if err != nil {
447
return err
···
453
})
454
}
455
456
+
func (a *StreamplaceAPI) ServeHTTPRedirect(ctx context.Context) error {
457
handler, err := a.RedirectHandler(ctx)
458
if err != nil {
459
return err
···
465
})
466
}
467
468
+
func (a *StreamplaceAPI) ServeHTTPS(ctx context.Context) error {
469
handler, err := a.Handler(ctx)
470
if err != nil {
471
return err
···
481
})
482
}
483
484
+
func (a *StreamplaceAPI) ServerWithShutdown(ctx context.Context, handler http.Handler, serve func(*http.Server) error) error {
485
ctx, cancel := context.WithCancel(ctx)
486
handler = gziphandler.GzipHandler(handler)
487
server := http.Server{Handler: handler}
···
500
return server.Shutdown(ctx)
501
}
502
503
+
func (a *StreamplaceAPI) HandleHealthz(ctx context.Context) http.HandlerFunc {
504
return func(w http.ResponseWriter, req *http.Request) {
505
w.WriteHeader(200)
506
}
+9
-9
pkg/api/api_internal.go
+9
-9
pkg/api/api_internal.go
···
18
"strings"
19
"time"
20
21
-
"aquareum.tv/aquareum/pkg/errors"
22
-
"aquareum.tv/aquareum/pkg/log"
23
-
"aquareum.tv/aquareum/pkg/mist/mistconfig"
24
-
"aquareum.tv/aquareum/pkg/mist/misttriggers"
25
-
"aquareum.tv/aquareum/pkg/model"
26
-
v0 "aquareum.tv/aquareum/pkg/schema/v0"
27
"github.com/julienschmidt/httprouter"
28
sloghttp "github.com/samber/slog-http"
29
"golang.org/x/sync/errgroup"
30
)
31
32
-
func (a *AquareumAPI) ServeInternalHTTP(ctx context.Context) error {
33
handler, err := a.InternalHandler(ctx)
34
if err != nil {
35
return err
···
48
mkvRE = regexp.MustCompile(`^\d+\.mkv$`)
49
}
50
51
-
func (a *AquareumAPI) InternalHandler(ctx context.Context) (http.Handler, error) {
52
router := httprouter.New()
53
broker := misttriggers.NewTriggerBroker()
54
broker.OnPushOutStart(func(ctx context.Context, payload *misttriggers.PushOutStartPayload) (string, error) {
···
327
return handler, nil
328
}
329
330
-
func (a *AquareumAPI) keyToUser(ctx context.Context, key string) (string, error) {
331
payload, err := base64.URLEncoding.DecodeString(key)
332
if err != nil {
333
return "", err
···
18
"strings"
19
"time"
20
21
+
"stream.place/streamplace/pkg/errors"
22
+
"stream.place/streamplace/pkg/log"
23
+
"stream.place/streamplace/pkg/mist/mistconfig"
24
+
"stream.place/streamplace/pkg/mist/misttriggers"
25
+
"stream.place/streamplace/pkg/model"
26
+
v0 "stream.place/streamplace/pkg/schema/v0"
27
"github.com/julienschmidt/httprouter"
28
sloghttp "github.com/samber/slog-http"
29
"golang.org/x/sync/errgroup"
30
)
31
32
+
func (a *StreamplaceAPI) ServeInternalHTTP(ctx context.Context) error {
33
handler, err := a.InternalHandler(ctx)
34
if err != nil {
35
return err
···
48
mkvRE = regexp.MustCompile(`^\d+\.mkv$`)
49
}
50
51
+
func (a *StreamplaceAPI) InternalHandler(ctx context.Context) (http.Handler, error) {
52
router := httprouter.New()
53
broker := misttriggers.NewTriggerBroker()
54
broker.OnPushOutStart(func(ctx context.Context, payload *misttriggers.PushOutStartPayload) (string, error) {
···
327
return handler, nil
328
}
329
330
+
func (a *StreamplaceAPI) keyToUser(ctx context.Context, key string) (string, error) {
331
payload, err := base64.URLEncoding.DecodeString(key)
332
if err != nil {
333
return "", err
+11
-11
pkg/api/api_test.go
+11
-11
pkg/api/api_test.go
···
7
"net/http/httptest"
8
"testing"
9
10
-
"aquareum.tv/aquareum/pkg/config"
11
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712"
12
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712/eip712test"
13
-
_ "aquareum.tv/aquareum/pkg/media/mediatesting"
14
-
"aquareum.tv/aquareum/pkg/model"
15
-
"aquareum.tv/aquareum/pkg/notifications"
16
-
v0 "aquareum.tv/aquareum/pkg/schema/v0"
17
"github.com/julienschmidt/httprouter"
18
"github.com/stretchr/testify/assert"
19
"github.com/stretchr/testify/require"
···
61
t.Run(tt.name, func(t *testing.T) {
62
cli := &config.CLI{HttpAddr: tt.httpAddr, HttpsAddr: tt.httpsAddr}
63
mod := &model.DBModel{}
64
-
a := AquareumAPI{CLI: cli, Model: mod}
65
66
handler, err := a.RedirectHandler(context.Background())
67
assert.NoError(t, err, "RedirectHandler should not return an error")
···
112
for _, tt := range tests {
113
t.Run(tt.name, func(t *testing.T) {
114
cli := &config.CLI{AdminAccount: tt.adminAccount, FirebaseServiceAccount: "foo"}
115
-
a := AquareumAPI{CLI: cli, Model: mod, Signer: signer, FirebaseNotifier: &MockFirebase{}}
116
handler := a.HandleIdentityPUT(context.Background())
117
118
goLive := v0.Identity{
119
DID: "did:plc:dkh4rwafdcda4ko7lewe43ml",
120
-
Handle: "@aquareum.bsky.social",
121
}
122
signed, err := signer.SignMessage(goLive)
123
require.NoError(t, err)
124
125
-
req := httptest.NewRequest("PUT", "https://aquareum.tv/api/settings/example", bytes.NewReader(signed))
126
rr := httptest.NewRecorder()
127
128
handler(rr, req, httprouter.Params{{Key: "id", Value: "example"}})
···
7
"net/http/httptest"
8
"testing"
9
10
+
"stream.place/streamplace/pkg/config"
11
+
"stream.place/streamplace/pkg/crypto/signers/eip712"
12
+
"stream.place/streamplace/pkg/crypto/signers/eip712/eip712test"
13
+
_ "stream.place/streamplace/pkg/media/mediatesting"
14
+
"stream.place/streamplace/pkg/model"
15
+
"stream.place/streamplace/pkg/notifications"
16
+
v0 "stream.place/streamplace/pkg/schema/v0"
17
"github.com/julienschmidt/httprouter"
18
"github.com/stretchr/testify/assert"
19
"github.com/stretchr/testify/require"
···
61
t.Run(tt.name, func(t *testing.T) {
62
cli := &config.CLI{HttpAddr: tt.httpAddr, HttpsAddr: tt.httpsAddr}
63
mod := &model.DBModel{}
64
+
a := StreamplaceAPI{CLI: cli, Model: mod}
65
66
handler, err := a.RedirectHandler(context.Background())
67
assert.NoError(t, err, "RedirectHandler should not return an error")
···
112
for _, tt := range tests {
113
t.Run(tt.name, func(t *testing.T) {
114
cli := &config.CLI{AdminAccount: tt.adminAccount, FirebaseServiceAccount: "foo"}
115
+
a := StreamplaceAPI{CLI: cli, Model: mod, Signer: signer, FirebaseNotifier: &MockFirebase{}}
116
handler := a.HandleIdentityPUT(context.Background())
117
118
goLive := v0.Identity{
119
DID: "did:plc:dkh4rwafdcda4ko7lewe43ml",
120
+
Handle: "@streamplace.bsky.social",
121
}
122
signed, err := signer.SignMessage(goLive)
123
require.NoError(t, err)
124
125
+
req := httptest.NewRequest("PUT", "https://stream.place/api/settings/example", bytes.NewReader(signed))
126
rr := httptest.NewRecorder()
127
128
handler(rr, req, httprouter.Params{{Key: "id", Value: "example"}})
+8
-8
pkg/api/app-downloads.go
+8
-8
pkg/api/app-downloads.go
···
9
"regexp"
10
"strings"
11
12
-
apierrors "aquareum.tv/aquareum/pkg/errors"
13
-
"aquareum.tv/aquareum/pkg/log"
14
"github.com/julienschmidt/httprouter"
15
)
16
17
var (
18
-
re = regexp.MustCompile(`^aquareum(-desktop)?-(v[0-9]+\.[0-9]+\.[0-9]+)(-[0-9a-f]+)?-([0-9a-z]+)-([0-9a-z]+)\.(?:([0-9a-f]+)\.)?(.+)$`)
19
-
inputRe = regexp.MustCompile(`^aquareum(-desktop)?-([0-9a-z]+)-([0-9a-z]+)\.(.+)$`)
20
)
21
22
func queryGitlabReal(url string) (io.ReadCloser, error) {
···
29
30
var queryGitlab = queryGitlabReal
31
32
-
func (a *AquareumAPI) HandleAppDownload(ctx context.Context) httprouter.Handle {
33
return func(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
34
log.Log(ctx, "got here")
35
pathname := r.URL.Path
36
parts := strings.Split(pathname, "/")
37
if len(parts) < 4 {
38
-
apierrors.WriteHTTPBadRequest(w, "usage: /dl/latest/aquareum-linux-arm64.tar.gz", nil)
39
return
40
}
41
42
_, branch, file := parts[1], parts[2], parts[3]
43
if branch == "" || file == "" {
44
-
apierrors.WriteHTTPBadRequest(w, "usage: /dl/latest/aquareum-linux-arm64.tar.gz", nil)
45
return
46
}
47
···
97
return fmt.Sprintf("%s/packages/generic/%s/%s/%s", f.GitLabURL, f.Branch, f.FullVer(), f.Filename)
98
}
99
100
-
func (a *AquareumAPI) getGitlabPackage(branch string) ([]GitlabFile, error) {
101
packageURL := fmt.Sprintf("%s/packages?order_by=created_at&sort=desc&package_name=%s", a.CLI.GitLabURL, branch)
102
103
packageBody, err := queryGitlab(packageURL)
···
9
"regexp"
10
"strings"
11
12
+
apierrors "stream.place/streamplace/pkg/errors"
13
+
"stream.place/streamplace/pkg/log"
14
"github.com/julienschmidt/httprouter"
15
)
16
17
var (
18
+
re = regexp.MustCompile(`^streamplace(-desktop)?-(v[0-9]+\.[0-9]+\.[0-9]+)(-[0-9a-f]+)?-([0-9a-z]+)-([0-9a-z]+)\.(?:([0-9a-f]+)\.)?(.+)$`)
19
+
inputRe = regexp.MustCompile(`^streamplace(-desktop)?-([0-9a-z]+)-([0-9a-z]+)\.(.+)$`)
20
)
21
22
func queryGitlabReal(url string) (io.ReadCloser, error) {
···
29
30
var queryGitlab = queryGitlabReal
31
32
+
func (a *StreamplaceAPI) HandleAppDownload(ctx context.Context) httprouter.Handle {
33
return func(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
34
log.Log(ctx, "got here")
35
pathname := r.URL.Path
36
parts := strings.Split(pathname, "/")
37
if len(parts) < 4 {
38
+
apierrors.WriteHTTPBadRequest(w, "usage: /dl/latest/streamplace-linux-arm64.tar.gz", nil)
39
return
40
}
41
42
_, branch, file := parts[1], parts[2], parts[3]
43
if branch == "" || file == "" {
44
+
apierrors.WriteHTTPBadRequest(w, "usage: /dl/latest/streamplace-linux-arm64.tar.gz", nil)
45
return
46
}
47
···
97
return fmt.Sprintf("%s/packages/generic/%s/%s/%s", f.GitLabURL, f.Branch, f.FullVer(), f.Filename)
98
}
99
100
+
func (a *StreamplaceAPI) getGitlabPackage(branch string) ([]GitlabFile, error) {
101
packageURL := fmt.Sprintf("%s/packages?order_by=created_at&sort=desc&package_name=%s", a.CLI.GitLabURL, branch)
102
103
packageBody, err := queryGitlab(packageURL)
+103
-103
pkg/api/app-downloads_test.go
+103
-103
pkg/api/app-downloads_test.go
···
9
"net/http/httptest"
10
"testing"
11
12
-
"aquareum.tv/aquareum/pkg/config"
13
-
"aquareum.tv/aquareum/pkg/model"
14
"github.com/julienschmidt/httprouter"
15
"github.com/stretchr/testify/require"
16
)
17
18
-
func TestRegexAquareum(t *testing.T) {
19
tests := []struct {
20
filename string
21
shouldMatch bool
22
expectedGroups []string
23
}{
24
// Test cases for the 're' regex
25
-
{"aquareum-v1.2.3-abcdef-foo-bar.txt", true, []string{"", "v1.2.3", "-abcdef", "foo", "bar", "", "txt"}},
26
-
{"aquareum-v1.0.0-123456-hello-world.csv", true, []string{"", "v1.0.0", "-123456", "hello", "world", "", "csv"}},
27
-
{"aquareum-v2.5.1-abc123-done-done.xml", true, []string{"", "v2.5.1", "-abc123", "done", "done", "", "xml"}},
28
-
{"aquareum-v3.2.1-xyz-abc.json", true, []string{"", "v3.2.1", "", "xyz", "abc", "", "json"}},
29
-
{"aquareum-v3.2.1-nohash-xyz.json", true, []string{"", "v3.2.1", "", "nohash", "xyz", "", "json"}},
30
-
{"aquareum-v10.2.10-abc123-linux-amd64.json", true, []string{"", "v10.2.10", "-abc123", "linux", "amd64", "", "json"}},
31
-
{"aquareum-v10.2.10-darwin-arm64.json", true, []string{"", "v10.2.10", "", "darwin", "arm64", "", "json"}},
32
-
{"aquareum-desktop-v3.2.1-nohash-xyz.json", true, []string{"-desktop", "v3.2.1", "", "nohash", "xyz", "", "json"}},
33
-
{"aquareum-desktop-v10.2.10-abc123-linux-amd64.json", true, []string{"-desktop", "v10.2.10", "-abc123", "linux", "amd64", "", "json"}},
34
-
{"aquareum-desktop-v10.2.10-darwin-arm64.json", true, []string{"-desktop", "v10.2.10", "", "darwin", "arm64", "", "json"}},
35
-
{"aquareum-desktop-v10.2.10-darwin-arm64.json", true, []string{"-desktop", "v10.2.10", "", "darwin", "arm64", "", "json"}},
36
-
{"aquareum-desktop-v0.1.3-5742a5a4-windows-amd64.1cbc2208decb3e55c7aea7320258aa36e3297f18.nupkg", true, []string{"-desktop", "v0.1.3", "-5742a5a4", "windows", "amd64", "1cbc2208decb3e55c7aea7320258aa36e3297f18", "nupkg"}},
37
38
// Test cases where the regex should not match
39
-
{"aquareum-123-abc.txt", false, nil},
40
-
{"aquareum-v1.2.3-abc.txt", false, nil},
41
}
42
43
for _, test := range tests {
···
63
expectedGroups []string
64
}{
65
// Test cases for the 'inputRe' regex
66
-
{"aquareum-foo-bar.txt", true, []string{"", "foo", "bar", "txt"}},
67
-
{"aquareum-abc-def.csv", true, []string{"", "abc", "def", "csv"}},
68
-
{"aquareum-x-y.xml", true, []string{"", "x", "y", "xml"}},
69
-
{"aquareum-hello-world.json", true, []string{"", "hello", "world", "json"}},
70
-
{"aquareum-desktop-x-y.xml", true, []string{"-desktop", "x", "y", "xml"}},
71
-
{"aquareum-desktop-hello-world.json", true, []string{"-desktop", "hello", "world", "json"}},
72
73
// Test cases where the regex should not match
74
-
{"aquareum-foo.txt", false, nil},
75
-
{"aquareum-foo-bar-baz.txt", false, nil},
76
-
{"aquareum-foo-bar-baz-qux.txt", false, nil},
77
-
{"aquareumfoo-bar.txt", false, nil},
78
-
{"aquareum-foo-bar.", false, nil},
79
}
80
81
for _, test := range tests {
···
117
out string
118
}{
119
{
120
-
in: "aquareum-linux-amd64.tar.gz",
121
-
out: "v0.1.3-51aab8b5/aquareum-v0.1.3-51aab8b5-linux-amd64.tar.gz",
122
},
123
{
124
-
in: "aquareum-linux-arm64.tar.gz",
125
-
out: "v0.1.3-51aab8b5/aquareum-v0.1.3-51aab8b5-linux-arm64.tar.gz",
126
},
127
{
128
-
in: "aquareum-darwin-amd64.tar.gz",
129
-
out: "v0.1.3-51aab8b5/aquareum-v0.1.3-51aab8b5-darwin-amd64.tar.gz",
130
},
131
{
132
-
in: "aquareum-darwin-arm64.tar.gz",
133
-
out: "v0.1.3-51aab8b5/aquareum-v0.1.3-51aab8b5-darwin-arm64.tar.gz",
134
},
135
{
136
-
in: "aquareum-windows-amd64.zip",
137
-
out: "v0.1.3-51aab8b5/aquareum-v0.1.3-51aab8b5-windows-amd64.zip",
138
},
139
{
140
-
in: "aquareum-desktop-windows-amd64.exe",
141
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-windows-amd64.exe",
142
},
143
{
144
-
in: "aquareum-desktop-darwin-amd64.dmg",
145
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-darwin-amd64.dmg",
146
},
147
{
148
-
in: "aquareum-desktop-darwin-arm64.dmg",
149
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-darwin-arm64.dmg",
150
},
151
{
152
-
in: "aquareum-desktop-darwin-amd64.zip",
153
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-darwin-amd64.zip",
154
},
155
{
156
-
in: "aquareum-desktop-darwin-arm64.zip",
157
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-darwin-arm64.zip",
158
},
159
{
160
-
in: "aquareum-desktop-linux-amd64.AppImage",
161
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-linux-amd64.AppImage",
162
},
163
{
164
-
in: "aquareum-desktop-linux-arm64.AppImage",
165
-
out: "v0.1.3-51aab8b5/aquareum-desktop-v0.1.3-51aab8b5-linux-arm64.AppImage",
166
},
167
}
168
169
for _, tt := range tests {
170
t.Run(tt.in, func(t *testing.T) {
171
mod := &model.DBModel{}
172
-
a := AquareumAPI{CLI: cli, Model: mod}
173
174
handler := a.HandleAppDownload(context.Background())
175
···
195
var packageRes = []byte(`
196
[
197
{
198
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/339" },
199
"created_at": "2024-09-19T20:28:06.445Z",
200
"id": 339,
201
"last_downloaded_at": "2024-09-19T20:40:18.942Z",
···
220
"username": "iameli-streams",
221
"web_url": "https://git.aquareum.tv/iameli-streams"
222
},
223
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
224
},
225
"pipelines": [],
226
"status": "default",
···
228
"version": "v0.1.3-51aab8b5"
229
},
230
{
231
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/338" },
232
"created_at": "2024-09-18T23:53:51.141Z",
233
"id": 338,
234
"last_downloaded_at": "2024-09-19T00:10:31.948Z",
···
253
"username": "iameli-streams",
254
"web_url": "https://git.aquareum.tv/iameli-streams"
255
},
256
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/571"
257
},
258
"pipelines": [],
259
"status": "default",
···
261
"version": "v0.1.3-78fcaf17"
262
},
263
{
264
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/337" },
265
"created_at": "2024-09-17T20:19:55.436Z",
266
"id": 337,
267
"last_downloaded_at": "2024-09-17T21:04:52.491Z",
···
286
"username": "iameli-streams",
287
"web_url": "https://git.aquareum.tv/iameli-streams"
288
},
289
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/567"
290
},
291
"pipelines": [],
292
"status": "default",
···
294
"version": "v0.1.3-4043c87a"
295
},
296
{
297
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/336" },
298
"created_at": "2024-09-17T04:08:57.406Z",
299
"id": 336,
300
"last_downloaded_at": "2024-09-17T04:34:20.263Z",
···
319
"username": "iameli",
320
"web_url": "https://git.aquareum.tv/iameli"
321
},
322
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/566"
323
},
324
"pipelines": [],
325
"status": "default",
···
327
"version": "v0.1.3-a32eed67"
328
},
329
{
330
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/335" },
331
"created_at": "2024-09-17T00:18:09.095Z",
332
"id": 335,
333
"last_downloaded_at": "2024-09-17T03:50:09.272Z",
···
352
"username": "iameli-streams",
353
"web_url": "https://git.aquareum.tv/iameli-streams"
354
},
355
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/565"
356
},
357
"pipelines": [],
358
"status": "default",
···
360
"version": "v0.1.3-41ee5c4c"
361
},
362
{
363
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/334" },
364
"created_at": "2024-09-16T23:47:04.209Z",
365
"id": 334,
366
"last_downloaded_at": null,
···
385
"username": "iameli-streams",
386
"web_url": "https://git.aquareum.tv/iameli-streams"
387
},
388
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/564"
389
},
390
"pipelines": [],
391
"status": "default",
···
393
"version": "v0.1.3-fa71bac9"
394
},
395
{
396
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/333" },
397
"created_at": "2024-09-16T22:52:23.113Z",
398
"id": 333,
399
"last_downloaded_at": null,
···
418
"username": "iameli-streams",
419
"web_url": "https://git.aquareum.tv/iameli-streams"
420
},
421
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/563"
422
},
423
"pipelines": [],
424
"status": "default",
···
426
"version": "v0.1.3-54d95b19"
427
},
428
{
429
-
"_links": { "web_path": "/aquareum-tv/aquareum/-/packages/332" },
430
"created_at": "2024-09-16T20:29:27.305Z",
431
"id": 332,
432
"last_downloaded_at": "2024-09-16T20:40:19.669Z",
···
451
"username": "iameli-streams",
452
"web_url": "https://git.aquareum.tv/iameli-streams"
453
},
454
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/561"
455
},
456
"pipelines": [],
457
"status": "default",
···
466
{
467
"created_at": "2024-09-19T20:28:06.468Z",
468
"file_md5": null,
469
-
"file_name": "aquareum-v0.1.3-51aab8b5-ios-release.xcarchive.tar.gz",
470
"file_sha1": null,
471
"file_sha256": "d4d88c885f1494e3698ac24923a2b1d1e632a6c936d039f392e927fe1c4e8fa0",
472
"id": 1994,
···
491
"username": "iameli-streams",
492
"web_url": "https://git.aquareum.tv/iameli-streams"
493
},
494
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
495
}
496
],
497
"size": 44092840
···
499
{
500
"created_at": "2024-09-19T20:29:59.539Z",
501
"file_md5": null,
502
-
"file_name": "aquareum-v0.1.3-51aab8b5-android-release.apk",
503
"file_sha1": null,
504
"file_sha256": "d409d179f7fa5eb7834607a76a845681d0358b8c1652d2a6206a967a0a1e4a07",
505
"id": 1995,
···
524
"username": "iameli-streams",
525
"web_url": "https://git.aquareum.tv/iameli-streams"
526
},
527
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
528
}
529
],
530
"size": 77485100
···
532
{
533
"created_at": "2024-09-19T20:30:00.386Z",
534
"file_md5": null,
535
-
"file_name": "aquareum-v0.1.3-51aab8b5-darwin-amd64.tar.gz",
536
"file_sha1": null,
537
"file_sha256": "c019a776e3e43b0fc40bdbda972ac6bc98ed1df54016ce4510452044175ab1fb",
538
"id": 1996,
···
557
"username": "iameli-streams",
558
"web_url": "https://git.aquareum.tv/iameli-streams"
559
},
560
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
561
}
562
],
563
"size": 35380619
···
565
{
566
"created_at": "2024-09-19T20:30:03.952Z",
567
"file_md5": null,
568
-
"file_name": "aquareum-v0.1.3-51aab8b5-android-debug.apk",
569
"file_sha1": null,
570
"file_sha256": "4fdef8e9afcc0b50971595470e5373de7e71e49c909b53729d881c1d11998e64",
571
"id": 1997,
···
590
"username": "iameli-streams",
591
"web_url": "https://git.aquareum.tv/iameli-streams"
592
},
593
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
594
}
595
],
596
"size": 165891665
···
598
{
599
"created_at": "2024-09-19T20:30:06.333Z",
600
"file_md5": null,
601
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-darwin-amd64.dmg",
602
"file_sha1": null,
603
"file_sha256": "c397c9e689e5aa14e4e608d6b8bfe684aaa80d0fd96e65c2240a23f1bbe2584e",
604
"id": 1998,
···
623
"username": "iameli-streams",
624
"web_url": "https://git.aquareum.tv/iameli-streams"
625
},
626
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
627
}
628
],
629
"size": 138530555
···
631
{
632
"created_at": "2024-09-19T20:30:06.515Z",
633
"file_md5": null,
634
-
"file_name": "aquareum-v0.1.3-51aab8b5-android-release.aab",
635
"file_sha1": null,
636
"file_sha256": "b76828177c0dd02cfe80a763034acdbfd6cedd70e5afd4eefa3221acf7170d75",
637
"id": 1999,
···
656
"username": "iameli-streams",
657
"web_url": "https://git.aquareum.tv/iameli-streams"
658
},
659
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
660
}
661
],
662
"size": 39472720
···
664
{
665
"created_at": "2024-09-19T20:30:09.006Z",
666
"file_md5": null,
667
-
"file_name": "aquareum-v0.1.3-51aab8b5-android-debug.aab",
668
"file_sha1": null,
669
"file_sha256": "0bcf65f37ca70d2f3d904d4eedcb1dc4e162901fe3115a77eedea4aefca0b58e",
670
"id": 2000,
···
689
"username": "iameli-streams",
690
"web_url": "https://git.aquareum.tv/iameli-streams"
691
},
692
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
693
}
694
],
695
"size": 54428823
···
697
{
698
"created_at": "2024-09-19T20:30:11.825Z",
699
"file_md5": null,
700
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-darwin-amd64.zip",
701
"file_sha1": null,
702
"file_sha256": "d6507feb9227b374b15eaf5558abdc31a652d977cc0d089352dea494399e9dcd",
703
"id": 2001,
···
722
"username": "iameli-streams",
723
"web_url": "https://git.aquareum.tv/iameli-streams"
724
},
725
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
726
}
727
],
728
"size": 137738479
···
730
{
731
"created_at": "2024-09-19T20:30:15.385Z",
732
"file_md5": null,
733
-
"file_name": "aquareum-v0.1.3-51aab8b5-darwin-arm64.tar.gz",
734
"file_sha1": null,
735
"file_sha256": "2e1425d550c54b52a708a97b6c545ae511bee79f04490867c63331a3560c0a87",
736
"id": 2002,
···
755
"username": "iameli-streams",
756
"web_url": "https://git.aquareum.tv/iameli-streams"
757
},
758
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
759
}
760
],
761
"size": 34455283
···
763
{
764
"created_at": "2024-09-19T20:30:20.884Z",
765
"file_md5": null,
766
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-darwin-arm64.dmg",
767
"file_sha1": null,
768
"file_sha256": "92bc4e858a03330a034f2f71d7579f35491b651613050d48a548667cb2d74059",
769
"id": 2003,
···
788
"username": "iameli-streams",
789
"web_url": "https://git.aquareum.tv/iameli-streams"
790
},
791
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
792
}
793
],
794
"size": 132833884
···
796
{
797
"created_at": "2024-09-19T20:30:26.199Z",
798
"file_md5": null,
799
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-darwin-arm64.zip",
800
"file_sha1": null,
801
"file_sha256": "06ab9412bdc23e48d124cc6cb032d1f21c75138965ee4c8b87b1524cedfa5318",
802
"id": 2004,
···
821
"username": "iameli-streams",
822
"web_url": "https://git.aquareum.tv/iameli-streams"
823
},
824
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
825
}
826
],
827
"size": 131923036
···
829
{
830
"created_at": "2024-09-19T20:39:30.156Z",
831
"file_md5": null,
832
-
"file_name": "aquareum-v0.1.3-51aab8b5-linux-amd64.tar.gz",
833
"file_sha1": null,
834
"file_sha256": "f7bf0191c5d5bd2d94533f8e3562a0f30df8a166efe97bf2d95802a7a3592054",
835
"id": 2005,
···
854
"username": "iameli-streams",
855
"web_url": "https://git.aquareum.tv/iameli-streams"
856
},
857
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
858
}
859
],
860
"size": 101700182
···
862
{
863
"created_at": "2024-09-19T20:39:35.057Z",
864
"file_md5": null,
865
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-linux-amd64.AppImage",
866
"file_sha1": null,
867
"file_sha256": "15f5a5104577cd7eae2c394d897ce06622fc7a0c567dba6c270a521ebf235dcc",
868
"id": 2006,
···
887
"username": "iameli-streams",
888
"web_url": "https://git.aquareum.tv/iameli-streams"
889
},
890
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
891
}
892
],
893
"size": 210871488
···
895
{
896
"created_at": "2024-09-19T20:39:38.495Z",
897
"file_md5": null,
898
-
"file_name": "aquareum-v0.1.3-51aab8b5-linux-arm64.tar.gz",
899
"file_sha1": null,
900
"file_sha256": "3b5f79b11333d3a7466c2f4377ce23c1cbc612fc136fefd5ac7bba4e0729ac0d",
901
"id": 2007,
···
920
"username": "iameli-streams",
921
"web_url": "https://git.aquareum.tv/iameli-streams"
922
},
923
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
924
}
925
],
926
"size": 97621477
···
928
{
929
"created_at": "2024-09-19T20:39:43.684Z",
930
"file_md5": null,
931
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-linux-arm64.AppImage",
932
"file_sha1": null,
933
"file_sha256": "82dff1e67de9796879e6a9573257c1f83f71326bf0ba4f33dec97d536a61f31c",
934
"id": 2008,
···
953
"username": "iameli-streams",
954
"web_url": "https://git.aquareum.tv/iameli-streams"
955
},
956
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
957
}
958
],
959
"size": 207205568
···
961
{
962
"created_at": "2024-09-19T20:39:46.855Z",
963
"file_md5": null,
964
-
"file_name": "aquareum-v0.1.3-51aab8b5-windows-amd64.zip",
965
"file_sha1": null,
966
"file_sha256": "e420f638ddc7f6352ea78a30a8efab12672e8840158d2fba04a8cf448a8edaa1",
967
"id": 2009,
···
986
"username": "iameli-streams",
987
"web_url": "https://git.aquareum.tv/iameli-streams"
988
},
989
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
990
}
991
],
992
"size": 67260033
···
994
{
995
"created_at": "2024-09-19T20:39:51.454Z",
996
"file_md5": null,
997
-
"file_name": "aquareum-desktop-v0.1.3-51aab8b5-windows-amd64.exe",
998
"file_sha1": null,
999
"file_sha256": "b0b44dfb460b3faf7dd13f97df9f91815b865283bb92d810304b537cbabaa2b1",
1000
"id": 2010,
···
1019
"username": "iameli-streams",
1020
"web_url": "https://git.aquareum.tv/iameli-streams"
1021
},
1022
-
"web_url": "https://git.aquareum.tv/aquareum-tv/aquareum/-/pipelines/572"
1023
}
1024
],
1025
"size": 175016960
···
9
"net/http/httptest"
10
"testing"
11
12
+
"stream.place/streamplace/pkg/config"
13
+
"stream.place/streamplace/pkg/model"
14
"github.com/julienschmidt/httprouter"
15
"github.com/stretchr/testify/require"
16
)
17
18
+
func TestRegexStreamplace(t *testing.T) {
19
tests := []struct {
20
filename string
21
shouldMatch bool
22
expectedGroups []string
23
}{
24
// Test cases for the 're' regex
25
+
{"streamplace-v1.2.3-abcdef-foo-bar.txt", true, []string{"", "v1.2.3", "-abcdef", "foo", "bar", "", "txt"}},
26
+
{"streamplace-v1.0.0-123456-hello-world.csv", true, []string{"", "v1.0.0", "-123456", "hello", "world", "", "csv"}},
27
+
{"streamplace-v2.5.1-abc123-done-done.xml", true, []string{"", "v2.5.1", "-abc123", "done", "done", "", "xml"}},
28
+
{"streamplace-v3.2.1-xyz-abc.json", true, []string{"", "v3.2.1", "", "xyz", "abc", "", "json"}},
29
+
{"streamplace-v3.2.1-nohash-xyz.json", true, []string{"", "v3.2.1", "", "nohash", "xyz", "", "json"}},
30
+
{"streamplace-v10.2.10-abc123-linux-amd64.json", true, []string{"", "v10.2.10", "-abc123", "linux", "amd64", "", "json"}},
31
+
{"streamplace-v10.2.10-darwin-arm64.json", true, []string{"", "v10.2.10", "", "darwin", "arm64", "", "json"}},
32
+
{"streamplace-desktop-v3.2.1-nohash-xyz.json", true, []string{"-desktop", "v3.2.1", "", "nohash", "xyz", "", "json"}},
33
+
{"streamplace-desktop-v10.2.10-abc123-linux-amd64.json", true, []string{"-desktop", "v10.2.10", "-abc123", "linux", "amd64", "", "json"}},
34
+
{"streamplace-desktop-v10.2.10-darwin-arm64.json", true, []string{"-desktop", "v10.2.10", "", "darwin", "arm64", "", "json"}},
35
+
{"streamplace-desktop-v10.2.10-darwin-arm64.json", true, []string{"-desktop", "v10.2.10", "", "darwin", "arm64", "", "json"}},
36
+
{"streamplace-desktop-v0.1.3-5742a5a4-windows-amd64.1cbc2208decb3e55c7aea7320258aa36e3297f18.nupkg", true, []string{"-desktop", "v0.1.3", "-5742a5a4", "windows", "amd64", "1cbc2208decb3e55c7aea7320258aa36e3297f18", "nupkg"}},
37
38
// Test cases where the regex should not match
39
+
{"streamplace-123-abc.txt", false, nil},
40
+
{"streamplace-v1.2.3-abc.txt", false, nil},
41
}
42
43
for _, test := range tests {
···
63
expectedGroups []string
64
}{
65
// Test cases for the 'inputRe' regex
66
+
{"streamplace-foo-bar.txt", true, []string{"", "foo", "bar", "txt"}},
67
+
{"streamplace-abc-def.csv", true, []string{"", "abc", "def", "csv"}},
68
+
{"streamplace-x-y.xml", true, []string{"", "x", "y", "xml"}},
69
+
{"streamplace-hello-world.json", true, []string{"", "hello", "world", "json"}},
70
+
{"streamplace-desktop-x-y.xml", true, []string{"-desktop", "x", "y", "xml"}},
71
+
{"streamplace-desktop-hello-world.json", true, []string{"-desktop", "hello", "world", "json"}},
72
73
// Test cases where the regex should not match
74
+
{"streamplace-foo.txt", false, nil},
75
+
{"streamplace-foo-bar-baz.txt", false, nil},
76
+
{"streamplace-foo-bar-baz-qux.txt", false, nil},
77
+
{"streamplacefoo-bar.txt", false, nil},
78
+
{"streamplace-foo-bar.", false, nil},
79
}
80
81
for _, test := range tests {
···
117
out string
118
}{
119
{
120
+
in: "streamplace-linux-amd64.tar.gz",
121
+
out: "v0.1.3-51aab8b5/streamplace-v0.1.3-51aab8b5-linux-amd64.tar.gz",
122
},
123
{
124
+
in: "streamplace-linux-arm64.tar.gz",
125
+
out: "v0.1.3-51aab8b5/streamplace-v0.1.3-51aab8b5-linux-arm64.tar.gz",
126
},
127
{
128
+
in: "streamplace-darwin-amd64.tar.gz",
129
+
out: "v0.1.3-51aab8b5/streamplace-v0.1.3-51aab8b5-darwin-amd64.tar.gz",
130
},
131
{
132
+
in: "streamplace-darwin-arm64.tar.gz",
133
+
out: "v0.1.3-51aab8b5/streamplace-v0.1.3-51aab8b5-darwin-arm64.tar.gz",
134
},
135
{
136
+
in: "streamplace-windows-amd64.zip",
137
+
out: "v0.1.3-51aab8b5/streamplace-v0.1.3-51aab8b5-windows-amd64.zip",
138
},
139
{
140
+
in: "streamplace-desktop-windows-amd64.exe",
141
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-windows-amd64.exe",
142
},
143
{
144
+
in: "streamplace-desktop-darwin-amd64.dmg",
145
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-darwin-amd64.dmg",
146
},
147
{
148
+
in: "streamplace-desktop-darwin-arm64.dmg",
149
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-darwin-arm64.dmg",
150
},
151
{
152
+
in: "streamplace-desktop-darwin-amd64.zip",
153
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-darwin-amd64.zip",
154
},
155
{
156
+
in: "streamplace-desktop-darwin-arm64.zip",
157
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-darwin-arm64.zip",
158
},
159
{
160
+
in: "streamplace-desktop-linux-amd64.AppImage",
161
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-linux-amd64.AppImage",
162
},
163
{
164
+
in: "streamplace-desktop-linux-arm64.AppImage",
165
+
out: "v0.1.3-51aab8b5/streamplace-desktop-v0.1.3-51aab8b5-linux-arm64.AppImage",
166
},
167
}
168
169
for _, tt := range tests {
170
t.Run(tt.in, func(t *testing.T) {
171
mod := &model.DBModel{}
172
+
a := StreamplaceAPI{CLI: cli, Model: mod}
173
174
handler := a.HandleAppDownload(context.Background())
175
···
195
var packageRes = []byte(`
196
[
197
{
198
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/339" },
199
"created_at": "2024-09-19T20:28:06.445Z",
200
"id": 339,
201
"last_downloaded_at": "2024-09-19T20:40:18.942Z",
···
220
"username": "iameli-streams",
221
"web_url": "https://git.aquareum.tv/iameli-streams"
222
},
223
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
224
},
225
"pipelines": [],
226
"status": "default",
···
228
"version": "v0.1.3-51aab8b5"
229
},
230
{
231
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/338" },
232
"created_at": "2024-09-18T23:53:51.141Z",
233
"id": 338,
234
"last_downloaded_at": "2024-09-19T00:10:31.948Z",
···
253
"username": "iameli-streams",
254
"web_url": "https://git.aquareum.tv/iameli-streams"
255
},
256
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/571"
257
},
258
"pipelines": [],
259
"status": "default",
···
261
"version": "v0.1.3-78fcaf17"
262
},
263
{
264
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/337" },
265
"created_at": "2024-09-17T20:19:55.436Z",
266
"id": 337,
267
"last_downloaded_at": "2024-09-17T21:04:52.491Z",
···
286
"username": "iameli-streams",
287
"web_url": "https://git.aquareum.tv/iameli-streams"
288
},
289
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/567"
290
},
291
"pipelines": [],
292
"status": "default",
···
294
"version": "v0.1.3-4043c87a"
295
},
296
{
297
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/336" },
298
"created_at": "2024-09-17T04:08:57.406Z",
299
"id": 336,
300
"last_downloaded_at": "2024-09-17T04:34:20.263Z",
···
319
"username": "iameli",
320
"web_url": "https://git.aquareum.tv/iameli"
321
},
322
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/566"
323
},
324
"pipelines": [],
325
"status": "default",
···
327
"version": "v0.1.3-a32eed67"
328
},
329
{
330
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/335" },
331
"created_at": "2024-09-17T00:18:09.095Z",
332
"id": 335,
333
"last_downloaded_at": "2024-09-17T03:50:09.272Z",
···
352
"username": "iameli-streams",
353
"web_url": "https://git.aquareum.tv/iameli-streams"
354
},
355
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/565"
356
},
357
"pipelines": [],
358
"status": "default",
···
360
"version": "v0.1.3-41ee5c4c"
361
},
362
{
363
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/334" },
364
"created_at": "2024-09-16T23:47:04.209Z",
365
"id": 334,
366
"last_downloaded_at": null,
···
385
"username": "iameli-streams",
386
"web_url": "https://git.aquareum.tv/iameli-streams"
387
},
388
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/564"
389
},
390
"pipelines": [],
391
"status": "default",
···
393
"version": "v0.1.3-fa71bac9"
394
},
395
{
396
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/333" },
397
"created_at": "2024-09-16T22:52:23.113Z",
398
"id": 333,
399
"last_downloaded_at": null,
···
418
"username": "iameli-streams",
419
"web_url": "https://git.aquareum.tv/iameli-streams"
420
},
421
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/563"
422
},
423
"pipelines": [],
424
"status": "default",
···
426
"version": "v0.1.3-54d95b19"
427
},
428
{
429
+
"_links": { "web_path": "/streamplace/streamplace/-/packages/332" },
430
"created_at": "2024-09-16T20:29:27.305Z",
431
"id": 332,
432
"last_downloaded_at": "2024-09-16T20:40:19.669Z",
···
451
"username": "iameli-streams",
452
"web_url": "https://git.aquareum.tv/iameli-streams"
453
},
454
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/561"
455
},
456
"pipelines": [],
457
"status": "default",
···
466
{
467
"created_at": "2024-09-19T20:28:06.468Z",
468
"file_md5": null,
469
+
"file_name": "streamplace-v0.1.3-51aab8b5-ios-release.xcarchive.tar.gz",
470
"file_sha1": null,
471
"file_sha256": "d4d88c885f1494e3698ac24923a2b1d1e632a6c936d039f392e927fe1c4e8fa0",
472
"id": 1994,
···
491
"username": "iameli-streams",
492
"web_url": "https://git.aquareum.tv/iameli-streams"
493
},
494
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
495
}
496
],
497
"size": 44092840
···
499
{
500
"created_at": "2024-09-19T20:29:59.539Z",
501
"file_md5": null,
502
+
"file_name": "streamplace-v0.1.3-51aab8b5-android-release.apk",
503
"file_sha1": null,
504
"file_sha256": "d409d179f7fa5eb7834607a76a845681d0358b8c1652d2a6206a967a0a1e4a07",
505
"id": 1995,
···
524
"username": "iameli-streams",
525
"web_url": "https://git.aquareum.tv/iameli-streams"
526
},
527
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
528
}
529
],
530
"size": 77485100
···
532
{
533
"created_at": "2024-09-19T20:30:00.386Z",
534
"file_md5": null,
535
+
"file_name": "streamplace-v0.1.3-51aab8b5-darwin-amd64.tar.gz",
536
"file_sha1": null,
537
"file_sha256": "c019a776e3e43b0fc40bdbda972ac6bc98ed1df54016ce4510452044175ab1fb",
538
"id": 1996,
···
557
"username": "iameli-streams",
558
"web_url": "https://git.aquareum.tv/iameli-streams"
559
},
560
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
561
}
562
],
563
"size": 35380619
···
565
{
566
"created_at": "2024-09-19T20:30:03.952Z",
567
"file_md5": null,
568
+
"file_name": "streamplace-v0.1.3-51aab8b5-android-debug.apk",
569
"file_sha1": null,
570
"file_sha256": "4fdef8e9afcc0b50971595470e5373de7e71e49c909b53729d881c1d11998e64",
571
"id": 1997,
···
590
"username": "iameli-streams",
591
"web_url": "https://git.aquareum.tv/iameli-streams"
592
},
593
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
594
}
595
],
596
"size": 165891665
···
598
{
599
"created_at": "2024-09-19T20:30:06.333Z",
600
"file_md5": null,
601
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-darwin-amd64.dmg",
602
"file_sha1": null,
603
"file_sha256": "c397c9e689e5aa14e4e608d6b8bfe684aaa80d0fd96e65c2240a23f1bbe2584e",
604
"id": 1998,
···
623
"username": "iameli-streams",
624
"web_url": "https://git.aquareum.tv/iameli-streams"
625
},
626
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
627
}
628
],
629
"size": 138530555
···
631
{
632
"created_at": "2024-09-19T20:30:06.515Z",
633
"file_md5": null,
634
+
"file_name": "streamplace-v0.1.3-51aab8b5-android-release.aab",
635
"file_sha1": null,
636
"file_sha256": "b76828177c0dd02cfe80a763034acdbfd6cedd70e5afd4eefa3221acf7170d75",
637
"id": 1999,
···
656
"username": "iameli-streams",
657
"web_url": "https://git.aquareum.tv/iameli-streams"
658
},
659
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
660
}
661
],
662
"size": 39472720
···
664
{
665
"created_at": "2024-09-19T20:30:09.006Z",
666
"file_md5": null,
667
+
"file_name": "streamplace-v0.1.3-51aab8b5-android-debug.aab",
668
"file_sha1": null,
669
"file_sha256": "0bcf65f37ca70d2f3d904d4eedcb1dc4e162901fe3115a77eedea4aefca0b58e",
670
"id": 2000,
···
689
"username": "iameli-streams",
690
"web_url": "https://git.aquareum.tv/iameli-streams"
691
},
692
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
693
}
694
],
695
"size": 54428823
···
697
{
698
"created_at": "2024-09-19T20:30:11.825Z",
699
"file_md5": null,
700
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-darwin-amd64.zip",
701
"file_sha1": null,
702
"file_sha256": "d6507feb9227b374b15eaf5558abdc31a652d977cc0d089352dea494399e9dcd",
703
"id": 2001,
···
722
"username": "iameli-streams",
723
"web_url": "https://git.aquareum.tv/iameli-streams"
724
},
725
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
726
}
727
],
728
"size": 137738479
···
730
{
731
"created_at": "2024-09-19T20:30:15.385Z",
732
"file_md5": null,
733
+
"file_name": "streamplace-v0.1.3-51aab8b5-darwin-arm64.tar.gz",
734
"file_sha1": null,
735
"file_sha256": "2e1425d550c54b52a708a97b6c545ae511bee79f04490867c63331a3560c0a87",
736
"id": 2002,
···
755
"username": "iameli-streams",
756
"web_url": "https://git.aquareum.tv/iameli-streams"
757
},
758
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
759
}
760
],
761
"size": 34455283
···
763
{
764
"created_at": "2024-09-19T20:30:20.884Z",
765
"file_md5": null,
766
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-darwin-arm64.dmg",
767
"file_sha1": null,
768
"file_sha256": "92bc4e858a03330a034f2f71d7579f35491b651613050d48a548667cb2d74059",
769
"id": 2003,
···
788
"username": "iameli-streams",
789
"web_url": "https://git.aquareum.tv/iameli-streams"
790
},
791
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
792
}
793
],
794
"size": 132833884
···
796
{
797
"created_at": "2024-09-19T20:30:26.199Z",
798
"file_md5": null,
799
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-darwin-arm64.zip",
800
"file_sha1": null,
801
"file_sha256": "06ab9412bdc23e48d124cc6cb032d1f21c75138965ee4c8b87b1524cedfa5318",
802
"id": 2004,
···
821
"username": "iameli-streams",
822
"web_url": "https://git.aquareum.tv/iameli-streams"
823
},
824
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
825
}
826
],
827
"size": 131923036
···
829
{
830
"created_at": "2024-09-19T20:39:30.156Z",
831
"file_md5": null,
832
+
"file_name": "streamplace-v0.1.3-51aab8b5-linux-amd64.tar.gz",
833
"file_sha1": null,
834
"file_sha256": "f7bf0191c5d5bd2d94533f8e3562a0f30df8a166efe97bf2d95802a7a3592054",
835
"id": 2005,
···
854
"username": "iameli-streams",
855
"web_url": "https://git.aquareum.tv/iameli-streams"
856
},
857
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
858
}
859
],
860
"size": 101700182
···
862
{
863
"created_at": "2024-09-19T20:39:35.057Z",
864
"file_md5": null,
865
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-linux-amd64.AppImage",
866
"file_sha1": null,
867
"file_sha256": "15f5a5104577cd7eae2c394d897ce06622fc7a0c567dba6c270a521ebf235dcc",
868
"id": 2006,
···
887
"username": "iameli-streams",
888
"web_url": "https://git.aquareum.tv/iameli-streams"
889
},
890
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
891
}
892
],
893
"size": 210871488
···
895
{
896
"created_at": "2024-09-19T20:39:38.495Z",
897
"file_md5": null,
898
+
"file_name": "streamplace-v0.1.3-51aab8b5-linux-arm64.tar.gz",
899
"file_sha1": null,
900
"file_sha256": "3b5f79b11333d3a7466c2f4377ce23c1cbc612fc136fefd5ac7bba4e0729ac0d",
901
"id": 2007,
···
920
"username": "iameli-streams",
921
"web_url": "https://git.aquareum.tv/iameli-streams"
922
},
923
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
924
}
925
],
926
"size": 97621477
···
928
{
929
"created_at": "2024-09-19T20:39:43.684Z",
930
"file_md5": null,
931
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-linux-arm64.AppImage",
932
"file_sha1": null,
933
"file_sha256": "82dff1e67de9796879e6a9573257c1f83f71326bf0ba4f33dec97d536a61f31c",
934
"id": 2008,
···
953
"username": "iameli-streams",
954
"web_url": "https://git.aquareum.tv/iameli-streams"
955
},
956
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
957
}
958
],
959
"size": 207205568
···
961
{
962
"created_at": "2024-09-19T20:39:46.855Z",
963
"file_md5": null,
964
+
"file_name": "streamplace-v0.1.3-51aab8b5-windows-amd64.zip",
965
"file_sha1": null,
966
"file_sha256": "e420f638ddc7f6352ea78a30a8efab12672e8840158d2fba04a8cf448a8edaa1",
967
"id": 2009,
···
986
"username": "iameli-streams",
987
"web_url": "https://git.aquareum.tv/iameli-streams"
988
},
989
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
990
}
991
],
992
"size": 67260033
···
994
{
995
"created_at": "2024-09-19T20:39:51.454Z",
996
"file_md5": null,
997
+
"file_name": "streamplace-desktop-v0.1.3-51aab8b5-windows-amd64.exe",
998
"file_sha1": null,
999
"file_sha256": "b0b44dfb460b3faf7dd13f97df9f91815b865283bb92d810304b537cbabaa2b1",
1000
"id": 2010,
···
1019
"username": "iameli-streams",
1020
"web_url": "https://git.aquareum.tv/iameli-streams"
1021
},
1022
+
"web_url": "https://git.aquareum.tv/streamplace/streamplace/-/pipelines/572"
1023
}
1024
],
1025
"size": 175016960
+4
-4
pkg/api/app-updates.go
+4
-4
pkg/api/app-updates.go
···
14
"net/http"
15
"strings"
16
17
-
"aquareum.tv/aquareum/js/app"
18
-
"aquareum.tv/aquareum/pkg/config"
19
-
"aquareum.tv/aquareum/pkg/log"
20
21
"github.com/dunglas/httpsfv"
22
)
···
252
}, nil
253
}
254
255
-
func (a *AquareumAPI) HandleAppUpdates(ctx context.Context) http.HandlerFunc {
256
return func(w http.ResponseWriter, req *http.Request) {
257
prefix := fmt.Sprintf("http://%s", req.Host)
258
if req.TLS != nil {
···
14
"net/http"
15
"strings"
16
17
+
"stream.place/streamplace/js/app"
18
+
"stream.place/streamplace/pkg/config"
19
+
"stream.place/streamplace/pkg/log"
20
21
"github.com/dunglas/httpsfv"
22
)
···
252
}, nil
253
}
254
255
+
func (a *StreamplaceAPI) HandleAppUpdates(ctx context.Context) http.HandlerFunc {
256
return func(w http.ResponseWriter, req *http.Request) {
257
prefix := fmt.Sprintf("http://%s", req.Host)
258
if req.TLS != nil {
+11
-11
pkg/api/desktop-updates.go
+11
-11
pkg/api/desktop-updates.go
···
8
"strconv"
9
"strings"
10
11
-
"aquareum.tv/aquareum/pkg/aqtime"
12
-
apierrors "aquareum.tv/aquareum/pkg/errors"
13
-
"aquareum.tv/aquareum/pkg/log"
14
"github.com/julienschmidt/httprouter"
15
)
16
···
60
Releases []MacManifestRelease `json:"releases"`
61
}
62
63
-
func (a *AquareumAPI) HandleDesktopUpdates(ctx context.Context) httprouter.Handle {
64
mac := a.HandleMacDesktopUpdates(ctx)
65
win := a.HandleWindowsDesktopUpdates(ctx)
66
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
···
75
}
76
}
77
78
-
func (a *AquareumAPI) HandleMacDesktopUpdates(ctx context.Context) httprouter.Handle {
79
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
80
platform := params.ByName("platform")
81
architecture := params.ByName("architecture")
···
112
updateTo := MacManifestUpdateTo{
113
Version: serverVersionZ,
114
PubDate: aqt.String(),
115
-
Notes: fmt.Sprintf("Aquareum %s", clientVersion),
116
-
Name: fmt.Sprintf("Aquareum %s", clientVersion),
117
-
URL: fmt.Sprintf("https://%s/dl/%s/aquareum-desktop-%s-%s.zip", req.Host, BRANCH, platform, architecture),
118
}
119
120
mani = MacManifest{
···
143
}
144
}
145
146
-
func (a *AquareumAPI) HandleWindowsDesktopUpdates(ctx context.Context) httprouter.Handle {
147
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
148
platform := params.ByName("platform")
149
architecture := params.ByName("architecture")
···
184
if file == "RELEASES" {
185
if clientBuildSec >= a.CLI.Build.BuildTime {
186
// client is newer or the same as server
187
-
fmt.Fprintf(w, "0000000000000000000000000000000000000000 aquareum_desktop-%s-full.nupkg 1", clientVersion)
188
return
189
}
190
-
fmt.Fprintf(w, "%s aquareum_desktop-%s-full.nupkg %d", gitlabFile.SHA1, gitlabFile.Version, gitlabFile.Size)
191
return
192
}
193
http.Redirect(w, req, gitlabFile.URL(), http.StatusTemporaryRedirect)
···
8
"strconv"
9
"strings"
10
11
+
"stream.place/streamplace/pkg/aqtime"
12
+
apierrors "stream.place/streamplace/pkg/errors"
13
+
"stream.place/streamplace/pkg/log"
14
"github.com/julienschmidt/httprouter"
15
)
16
···
60
Releases []MacManifestRelease `json:"releases"`
61
}
62
63
+
func (a *StreamplaceAPI) HandleDesktopUpdates(ctx context.Context) httprouter.Handle {
64
mac := a.HandleMacDesktopUpdates(ctx)
65
win := a.HandleWindowsDesktopUpdates(ctx)
66
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
···
75
}
76
}
77
78
+
func (a *StreamplaceAPI) HandleMacDesktopUpdates(ctx context.Context) httprouter.Handle {
79
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
80
platform := params.ByName("platform")
81
architecture := params.ByName("architecture")
···
112
updateTo := MacManifestUpdateTo{
113
Version: serverVersionZ,
114
PubDate: aqt.String(),
115
+
Notes: fmt.Sprintf("Streamplace %s", clientVersion),
116
+
Name: fmt.Sprintf("Streamplace %s", clientVersion),
117
+
URL: fmt.Sprintf("https://%s/dl/%s/streamplace-desktop-%s-%s.zip", req.Host, BRANCH, platform, architecture),
118
}
119
120
mani = MacManifest{
···
143
}
144
}
145
146
+
func (a *StreamplaceAPI) HandleWindowsDesktopUpdates(ctx context.Context) httprouter.Handle {
147
return func(w http.ResponseWriter, req *http.Request, params httprouter.Params) {
148
platform := params.ByName("platform")
149
architecture := params.ByName("architecture")
···
184
if file == "RELEASES" {
185
if clientBuildSec >= a.CLI.Build.BuildTime {
186
// client is newer or the same as server
187
+
fmt.Fprintf(w, "0000000000000000000000000000000000000000 streamplace_desktop-%s-full.nupkg 1", clientVersion)
188
return
189
}
190
+
fmt.Fprintf(w, "%s streamplace_desktop-%s-full.nupkg %d", gitlabFile.SHA1, gitlabFile.Version, gitlabFile.Size)
191
return
192
}
193
http.Redirect(w, req, gitlabFile.URL(), http.StatusTemporaryRedirect)
+15
-15
pkg/api/playback.go
+15
-15
pkg/api/playback.go
···
12
"strings"
13
"time"
14
15
-
"aquareum.tv/aquareum/pkg/aqtime"
16
-
"aquareum.tv/aquareum/pkg/atproto"
17
-
"aquareum.tv/aquareum/pkg/errors"
18
-
apierrors "aquareum.tv/aquareum/pkg/errors"
19
-
"aquareum.tv/aquareum/pkg/log"
20
-
"aquareum.tv/aquareum/pkg/media"
21
"github.com/decred/dcrd/dcrec/secp256k1"
22
"github.com/julienschmidt/httprouter"
23
"github.com/mr-tron/base58"
···
25
"golang.org/x/sync/errgroup"
26
)
27
28
-
func (a *AquareumAPI) NormalizeUser(ctx context.Context, user string) (string, error) {
29
alias, ok := a.Aliases[user]
30
if ok {
31
user = alias
32
}
33
user = strings.ToLower(user)
34
-
// aquareum signing key
35
if strings.HasPrefix(user, "0x") {
36
return user, nil
37
}
···
43
return key, nil
44
}
45
46
-
func (a *AquareumAPI) HandleMP4Playback(ctx context.Context) httprouter.Handle {
47
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
48
user := p.ByName("user")
49
if user == "" {
···
86
}
87
}
88
89
-
func (a *AquareumAPI) HandleMKVPlayback(ctx context.Context) httprouter.Handle {
90
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
91
user := p.ByName("user")
92
if user == "" {
···
129
}
130
}
131
132
-
func (a *AquareumAPI) HandleWebRTCPlayback(ctx context.Context) httprouter.Handle {
133
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
134
user := p.ByName("user")
135
if user == "" {
···
161
const BEARER_PREFIX = "Bearer "
162
const KEY_PREFIX = "0x"
163
164
-
func (a *AquareumAPI) HandleWebRTCIngest(ctx context.Context) httprouter.Handle {
165
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
166
ct := r.Header.Get("Content-Type")
167
if ct != "application/sdp" {
···
209
if did != "" {
210
_, err = atproto.SyncBlueskyRepo(ctx, did, a.Model)
211
if err != nil {
212
-
apierrors.WriteHTTPInternalServerError(w, "could not resolve aquareum key", err)
213
return
214
}
215
}
···
287
}
288
}
289
290
-
func (a *AquareumAPI) HandleHLSPlayback(ctx context.Context) httprouter.Handle {
291
return NoCache(func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
292
user := p.ByName("user")
293
if user == "" {
···
318
})
319
}
320
321
-
func (a *AquareumAPI) HandleThumbnailPlayback(ctx context.Context) httprouter.Handle {
322
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
323
user := p.ByName("user")
324
if user == "" {
···
12
"strings"
13
"time"
14
15
+
"stream.place/streamplace/pkg/aqtime"
16
+
"stream.place/streamplace/pkg/atproto"
17
+
"stream.place/streamplace/pkg/errors"
18
+
apierrors "stream.place/streamplace/pkg/errors"
19
+
"stream.place/streamplace/pkg/log"
20
+
"stream.place/streamplace/pkg/media"
21
"github.com/decred/dcrd/dcrec/secp256k1"
22
"github.com/julienschmidt/httprouter"
23
"github.com/mr-tron/base58"
···
25
"golang.org/x/sync/errgroup"
26
)
27
28
+
func (a *StreamplaceAPI) NormalizeUser(ctx context.Context, user string) (string, error) {
29
alias, ok := a.Aliases[user]
30
if ok {
31
user = alias
32
}
33
user = strings.ToLower(user)
34
+
// streamplace signing key
35
if strings.HasPrefix(user, "0x") {
36
return user, nil
37
}
···
43
return key, nil
44
}
45
46
+
func (a *StreamplaceAPI) HandleMP4Playback(ctx context.Context) httprouter.Handle {
47
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
48
user := p.ByName("user")
49
if user == "" {
···
86
}
87
}
88
89
+
func (a *StreamplaceAPI) HandleMKVPlayback(ctx context.Context) httprouter.Handle {
90
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
91
user := p.ByName("user")
92
if user == "" {
···
129
}
130
}
131
132
+
func (a *StreamplaceAPI) HandleWebRTCPlayback(ctx context.Context) httprouter.Handle {
133
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
134
user := p.ByName("user")
135
if user == "" {
···
161
const BEARER_PREFIX = "Bearer "
162
const KEY_PREFIX = "0x"
163
164
+
func (a *StreamplaceAPI) HandleWebRTCIngest(ctx context.Context) httprouter.Handle {
165
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
166
ct := r.Header.Get("Content-Type")
167
if ct != "application/sdp" {
···
209
if did != "" {
210
_, err = atproto.SyncBlueskyRepo(ctx, did, a.Model)
211
if err != nil {
212
+
apierrors.WriteHTTPInternalServerError(w, "could not resolve streamplace key", err)
213
return
214
}
215
}
···
287
}
288
}
289
290
+
func (a *StreamplaceAPI) HandleHLSPlayback(ctx context.Context) httprouter.Handle {
291
return NoCache(func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
292
user := p.ByName("user")
293
if user == "" {
···
318
})
319
}
320
321
+
func (a *StreamplaceAPI) HandleThumbnailPlayback(ctx context.Context) httprouter.Handle {
322
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
323
user := p.ByName("user")
324
if user == "" {
+1
-1
pkg/aqhttp/aqhttp.go
+1
-1
pkg/aqhttp/aqhttp.go
+7
-7
pkg/atproto/atproto.go
+7
-7
pkg/atproto/atproto.go
···
7
"strings"
8
"sync"
9
10
-
"aquareum.tv/aquareum/pkg/aqhttp"
11
-
"aquareum.tv/aquareum/pkg/crypto/aqpub"
12
-
"aquareum.tv/aquareum/pkg/log"
13
-
"aquareum.tv/aquareum/pkg/model"
14
comatproto "github.com/bluesky-social/indigo/api/atproto"
15
atcrypto "github.com/bluesky-social/indigo/atproto/crypto"
16
"github.com/bluesky-social/indigo/atproto/identity"
···
168
continue
169
}
170
processed += 1
171
-
aquareumKeyAny, ok := rec[STREAMPLACE_SIGNING_KEY]
172
if !ok {
173
continue
174
}
175
-
aquareumKey, ok := aquareumKeyAny.(string)
176
if !ok {
177
continue
178
}
179
-
key = aquareumKey
180
}
181
log.Log(ctx, "processed new posts", "postCount", processed)
182
···
7
"strings"
8
"sync"
9
10
+
"stream.place/streamplace/pkg/aqhttp"
11
+
"stream.place/streamplace/pkg/crypto/aqpub"
12
+
"stream.place/streamplace/pkg/log"
13
+
"stream.place/streamplace/pkg/model"
14
comatproto "github.com/bluesky-social/indigo/api/atproto"
15
atcrypto "github.com/bluesky-social/indigo/atproto/crypto"
16
"github.com/bluesky-social/indigo/atproto/identity"
···
168
continue
169
}
170
processed += 1
171
+
streamplaceKeyAny, ok := rec[STREAMPLACE_SIGNING_KEY]
172
if !ok {
173
continue
174
}
175
+
streamplaceKey, ok := streamplaceKeyAny.(string)
176
if !ok {
177
continue
178
}
179
+
key = streamplaceKey
180
}
181
log.Log(ctx, "processed new posts", "postCount", processed)
182
+12
-12
pkg/atproto/atproto_test.go
+12
-12
pkg/atproto/atproto_test.go
···
8
"path/filepath"
9
"testing"
10
11
-
"aquareum.tv/aquareum/pkg/model"
12
"github.com/bluesky-social/indigo/atproto/identity"
13
"github.com/bluesky-social/indigo/xrpc"
14
"github.com/stretchr/testify/require"
15
)
16
17
func TestKeyResolution(t *testing.T) {
18
// i wrote these tests before i renamed this and i don't wanna re-export, okay?
19
-
oldAquareumCollection := STREAMPLACE_COLLECTION
20
-
oldAquareumKey := STREAMPLACE_SIGNING_KEY
21
-
defer func() { STREAMPLACE_COLLECTION = oldAquareumCollection }()
22
-
defer func() { STREAMPLACE_SIGNING_KEY = oldAquareumKey }()
23
STREAMPLACE_COLLECTION = "app.bsky.feed.post"
24
STREAMPLACE_SIGNING_KEY = "aquareumKey"
25
···
45
46
// full sync
47
SyncGetRepo = MockSyncGetRepo(fullSync)
48
-
k, err := SyncBlueskyRepo(context.Background(), "aquareum.bsky.social", mod)
49
require.NoError(t, err)
50
require.Equal(t, firstKey, k)
51
52
// empty sync
53
SyncGetRepo = MockSyncGetRepo(emptySync)
54
-
k, err = SyncBlueskyRepo(context.Background(), "aquareum.bsky.social", mod)
55
require.NoError(t, err)
56
require.Equal(t, firstKey, k)
57
58
// incremental sync with no changes
59
SyncGetRepo = MockSyncGetRepo(incrementalSyncSameKey)
60
-
k, err = SyncBlueskyRepo(context.Background(), "aquareum.bsky.social", mod)
61
require.NoError(t, err)
62
require.Equal(t, firstKey, k)
63
64
-
// incremental sync with a new aquareum key
65
SyncGetRepo = MockSyncGetRepo(incrementalSyncNewKey)
66
-
k, err = SyncBlueskyRepo(context.Background(), "aquareum.bsky.social", mod)
67
require.NoError(t, err)
68
require.Equal(t, secondKey, k)
69
}
···
78
}
79
}
80
81
-
// captured from aquareum.bsky.social pds
82
var didDoc = []byte(`
83
{
84
"@context": [
···
87
"https://w3id.org/security/suites/secp256k1-2019/v1"
88
],
89
"alsoKnownAs": [
90
-
"at://aquareum.bsky.social"
91
],
92
"id": "did:plc:dkh4rwafdcda4ko7lewe43ml",
93
"service": [
···
8
"path/filepath"
9
"testing"
10
11
"github.com/bluesky-social/indigo/atproto/identity"
12
"github.com/bluesky-social/indigo/xrpc"
13
"github.com/stretchr/testify/require"
14
+
"stream.place/streamplace/pkg/model"
15
)
16
17
func TestKeyResolution(t *testing.T) {
18
// i wrote these tests before i renamed this and i don't wanna re-export, okay?
19
+
oldStreamplaceCollection := STREAMPLACE_COLLECTION
20
+
oldStreamplaceKey := STREAMPLACE_SIGNING_KEY
21
+
defer func() { STREAMPLACE_COLLECTION = oldStreamplaceCollection }()
22
+
defer func() { STREAMPLACE_SIGNING_KEY = oldStreamplaceKey }()
23
STREAMPLACE_COLLECTION = "app.bsky.feed.post"
24
STREAMPLACE_SIGNING_KEY = "aquareumKey"
25
···
45
46
// full sync
47
SyncGetRepo = MockSyncGetRepo(fullSync)
48
+
k, err := SyncBlueskyRepo(context.Background(), "streamplace.bsky.social", mod)
49
require.NoError(t, err)
50
require.Equal(t, firstKey, k)
51
52
// empty sync
53
SyncGetRepo = MockSyncGetRepo(emptySync)
54
+
k, err = SyncBlueskyRepo(context.Background(), "streamplace.bsky.social", mod)
55
require.NoError(t, err)
56
require.Equal(t, firstKey, k)
57
58
// incremental sync with no changes
59
SyncGetRepo = MockSyncGetRepo(incrementalSyncSameKey)
60
+
k, err = SyncBlueskyRepo(context.Background(), "streamplace.bsky.social", mod)
61
require.NoError(t, err)
62
require.Equal(t, firstKey, k)
63
64
+
// incremental sync with a new streamplace key
65
SyncGetRepo = MockSyncGetRepo(incrementalSyncNewKey)
66
+
k, err = SyncBlueskyRepo(context.Background(), "streamplace.bsky.social", mod)
67
require.NoError(t, err)
68
require.Equal(t, secondKey, k)
69
}
···
78
}
79
}
80
81
+
// captured from streamplace.bsky.social pds
82
var didDoc = []byte(`
83
{
84
"@context": [
···
87
"https://w3id.org/security/suites/secp256k1-2019/v1"
88
],
89
"alsoKnownAs": [
90
+
"at://streamplace.bsky.social"
91
],
92
"id": "did:plc:dkh4rwafdcda4ko7lewe43ml",
93
"service": [
+1
-1
pkg/atproto/client_metadata.go
+1
-1
pkg/atproto/client_metadata.go
···
51
// RedirectURIs: []string{fmt.Sprintf("https://%s/login", host)},
52
Scope: "atproto transition:generic",
53
TokenEndpointAuthMethod: "none",
54
-
ClientName: "Aquareum",
55
ResponseTypes: []string{"code"},
56
GrantTypes: []string{"authorization_code", "refresh_token"},
57
DPoPBoundAccessTokens: boolPtr(true),
···
51
// RedirectURIs: []string{fmt.Sprintf("https://%s/login", host)},
52
Scope: "atproto transition:generic",
53
TokenEndpointAuthMethod: "none",
54
+
ClientName: "Streamplace",
55
ResponseTypes: []string{"code"},
56
GrantTypes: []string{"authorization_code", "refresh_token"},
57
DPoPBoundAccessTokens: boolPtr(true),
+27
-27
pkg/cmd/aquareum.go
pkg/cmd/streamplace.go
+27
-27
pkg/cmd/aquareum.go
pkg/cmd/streamplace.go
···
16
"syscall"
17
"time"
18
19
-
"aquareum.tv/aquareum/pkg/aqhttp"
20
-
"aquareum.tv/aquareum/pkg/aqtime"
21
-
"aquareum.tv/aquareum/pkg/crypto/signers"
22
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712"
23
-
"aquareum.tv/aquareum/pkg/log"
24
-
"aquareum.tv/aquareum/pkg/media"
25
-
"aquareum.tv/aquareum/pkg/notifications"
26
-
notificationpkg "aquareum.tv/aquareum/pkg/notifications"
27
-
"aquareum.tv/aquareum/pkg/replication"
28
-
"aquareum.tv/aquareum/pkg/replication/boring"
29
-
v0 "aquareum.tv/aquareum/pkg/schema/v0"
30
"golang.org/x/term"
31
"gorm.io/gorm"
32
33
-
"aquareum.tv/aquareum/pkg/api"
34
-
"aquareum.tv/aquareum/pkg/config"
35
-
"aquareum.tv/aquareum/pkg/model"
36
"github.com/ThalesGroup/crypto11"
37
_ "github.com/go-gst/go-glib/glib"
38
_ "github.com/go-gst/go-gst/gst"
···
41
// Additional jobs that can be injected by platforms
42
type jobFunc func(ctx context.Context, cli *config.CLI) error
43
44
-
// parse the CLI and fire up an aquareum node!
45
func start(build *config.BuildFlags, platformJobs []jobFunc) error {
46
selfTest := len(os.Args) > 1 && os.Args[1] == "self-test"
47
err := media.RunSelfTest(context.Background())
···
50
fmt.Println(err.Error())
51
os.Exit(1)
52
} else {
53
-
retryCount, _ := strconv.Atoi(os.Getenv("AQUAREUM_SELFTEST_RETRY"))
54
if retryCount >= 3 {
55
log.Error(context.Background(), "gstreamer self-test failed 3 times, giving up", "error", err)
56
return err
57
}
58
log.Log(context.Background(), "error in gstreamer self-test, attempting recovery", "error", err, "retry", retryCount+1)
59
-
os.Setenv("AQUAREUM_SELFTEST_RETRY", strconv.Itoa(retryCount+1))
60
err := syscall.Exec(os.Args[0], os.Args[1:], os.Environ())
61
if err != nil {
62
log.Error(context.Background(), "error in gstreamer self-test, could not restart", "error", err)
···
74
75
if len(os.Args) > 1 && os.Args[1] == "stream" {
76
if len(os.Args) != 3 {
77
-
fmt.Println("usage: aquareum stream [user]")
78
os.Exit(1)
79
}
80
return Stream(os.Args[2])
···
91
}
92
flag.Set("logtostderr", "true")
93
vFlag := flag.Lookup("v")
94
-
fs := flag.NewFlagSet("aquareum", flag.ExitOnError)
95
cli := config.CLI{Build: build}
96
-
fs.StringVar(&cli.DataDir, "data-dir", config.DefaultDataDir(), "directory for keeping all aquareum data")
97
fs.StringVar(&cli.HttpAddr, "http-addr", ":38080", "Public HTTP address")
98
fs.StringVar(&cli.HttpInternalAddr, "http-internal-addr", "127.0.0.1:39090", "Private, admin-only HTTP address")
99
fs.StringVar(&cli.HttpsAddr, "https-addr", ":38443", "Public HTTPS address")
···
102
cli.DataDirFlag(fs, &cli.TLSKeyPath, "tls-key", filepath.Join("tls", "tls.key"), "Path to TLS key")
103
fs.StringVar(&cli.SigningKeyPath, "signing-key", "", "Path to signing key for pushing OTA updates to the app")
104
cli.DataDirFlag(fs, &cli.DBPath, "db-path", "db.sqlite", "path to sqlite database file")
105
-
fs.StringVar(&cli.AdminAccount, "admin-account", "", "ethereum account that administrates this aquareum node")
106
fs.StringVar(&cli.FirebaseServiceAccount, "firebase-service-account", "", "JSON string of a firebase service account key")
107
fs.StringVar(&cli.GitLabURL, "gitlab-url", "https://git.aquareum.tv/api/v4/projects/1", "gitlab url for generating download links")
108
cli.DataDirFlag(fs, &cli.EthKeystorePath, "eth-keystore-path", "keystore", "path to ethereum keystore")
···
116
fs.StringVar(&cli.PKCS11TokenSerial, "pkcs11-token-serial", "", "serial number of PKCS11 token (only use one of slot, label, or serial)")
117
fs.StringVar(&cli.PKCS11KeypairLabel, "pkcs11-keypair-label", "", "label of signing keypair on PKCS11 token")
118
fs.StringVar(&cli.PKCS11KeypairID, "pkcs11-keypair-id", "", "id of signing keypair on PKCS11 token")
119
-
fs.StringVar(&cli.StreamerName, "streamer-name", "", "name of the person streaming from this aquareum node")
120
fs.StringVar(&cli.FrontendProxy, "dev-frontend-proxy", "", "(FOR DEVELOPMENT ONLY) proxy frontend requests to this address instead of using the bundled frontend")
121
cli.StringSliceFlag(fs, &cli.AllowedStreams, "allowed-streams", "", "comma-separated list of addresses or atproto DIDs that this node will replicate")
122
-
cli.StringSliceFlag(fs, &cli.Peers, "peers", "", "other aquareum nodes to replicate to")
123
cli.DebugFlag(fs, &cli.Debug, "debug", "", "modified log verbosity for specific functions or files in form func=ToHLS:3,file=gstreamer.go:4")
124
fs.BoolVar(&cli.TestStream, "test-stream", false, "run a built-in test stream on boot")
125
doValidate := fs.Bool("validate", false, "validate media")
···
152
ctx = log.WithDebugValue(ctx, cli.Debug)
153
154
log.Log(ctx,
155
-
"aquareum",
156
"version", build.Version,
157
"buildTime", build.BuildTimeStr(),
158
"uuid", build.UUID,
···
167
return media.ValidateMedia(ctx)
168
}
169
170
-
aqhttp.UserAgent = fmt.Sprintf("aquareum/%s", build.Version)
171
172
err = os.MkdirAll(cli.DataDir, os.ModePerm)
173
if err != nil {
174
-
return fmt.Errorf("error creating aquareum dir at %s:%w", cli.DataDir, err)
175
}
176
schema, err := v0.MakeV0Schema()
177
if err != nil {
···
277
if err != nil {
278
return err
279
}
280
-
a, err := api.MakeAquareumAPI(&cli, mod, eip712signer, noter, mm, ms)
281
if err != nil {
282
return err
283
}
···
16
"syscall"
17
"time"
18
19
+
"stream.place/streamplace/pkg/aqhttp"
20
+
"stream.place/streamplace/pkg/aqtime"
21
+
"stream.place/streamplace/pkg/crypto/signers"
22
+
"stream.place/streamplace/pkg/crypto/signers/eip712"
23
+
"stream.place/streamplace/pkg/log"
24
+
"stream.place/streamplace/pkg/media"
25
+
"stream.place/streamplace/pkg/notifications"
26
+
notificationpkg "stream.place/streamplace/pkg/notifications"
27
+
"stream.place/streamplace/pkg/replication"
28
+
"stream.place/streamplace/pkg/replication/boring"
29
+
v0 "stream.place/streamplace/pkg/schema/v0"
30
"golang.org/x/term"
31
"gorm.io/gorm"
32
33
+
"stream.place/streamplace/pkg/api"
34
+
"stream.place/streamplace/pkg/config"
35
+
"stream.place/streamplace/pkg/model"
36
"github.com/ThalesGroup/crypto11"
37
_ "github.com/go-gst/go-glib/glib"
38
_ "github.com/go-gst/go-gst/gst"
···
41
// Additional jobs that can be injected by platforms
42
type jobFunc func(ctx context.Context, cli *config.CLI) error
43
44
+
// parse the CLI and fire up an streamplace node!
45
func start(build *config.BuildFlags, platformJobs []jobFunc) error {
46
selfTest := len(os.Args) > 1 && os.Args[1] == "self-test"
47
err := media.RunSelfTest(context.Background())
···
50
fmt.Println(err.Error())
51
os.Exit(1)
52
} else {
53
+
retryCount, _ := strconv.Atoi(os.Getenv("STREAMPLACE_SELFTEST_RETRY"))
54
if retryCount >= 3 {
55
log.Error(context.Background(), "gstreamer self-test failed 3 times, giving up", "error", err)
56
return err
57
}
58
log.Log(context.Background(), "error in gstreamer self-test, attempting recovery", "error", err, "retry", retryCount+1)
59
+
os.Setenv("STREAMPLACE_SELFTEST_RETRY", strconv.Itoa(retryCount+1))
60
err := syscall.Exec(os.Args[0], os.Args[1:], os.Environ())
61
if err != nil {
62
log.Error(context.Background(), "error in gstreamer self-test, could not restart", "error", err)
···
74
75
if len(os.Args) > 1 && os.Args[1] == "stream" {
76
if len(os.Args) != 3 {
77
+
fmt.Println("usage: streamplace stream [user]")
78
os.Exit(1)
79
}
80
return Stream(os.Args[2])
···
91
}
92
flag.Set("logtostderr", "true")
93
vFlag := flag.Lookup("v")
94
+
fs := flag.NewFlagSet("streamplace", flag.ExitOnError)
95
cli := config.CLI{Build: build}
96
+
fs.StringVar(&cli.DataDir, "data-dir", config.DefaultDataDir(), "directory for keeping all streamplace data")
97
fs.StringVar(&cli.HttpAddr, "http-addr", ":38080", "Public HTTP address")
98
fs.StringVar(&cli.HttpInternalAddr, "http-internal-addr", "127.0.0.1:39090", "Private, admin-only HTTP address")
99
fs.StringVar(&cli.HttpsAddr, "https-addr", ":38443", "Public HTTPS address")
···
102
cli.DataDirFlag(fs, &cli.TLSKeyPath, "tls-key", filepath.Join("tls", "tls.key"), "Path to TLS key")
103
fs.StringVar(&cli.SigningKeyPath, "signing-key", "", "Path to signing key for pushing OTA updates to the app")
104
cli.DataDirFlag(fs, &cli.DBPath, "db-path", "db.sqlite", "path to sqlite database file")
105
+
fs.StringVar(&cli.AdminAccount, "admin-account", "", "ethereum account that administrates this streamplace node")
106
fs.StringVar(&cli.FirebaseServiceAccount, "firebase-service-account", "", "JSON string of a firebase service account key")
107
fs.StringVar(&cli.GitLabURL, "gitlab-url", "https://git.aquareum.tv/api/v4/projects/1", "gitlab url for generating download links")
108
cli.DataDirFlag(fs, &cli.EthKeystorePath, "eth-keystore-path", "keystore", "path to ethereum keystore")
···
116
fs.StringVar(&cli.PKCS11TokenSerial, "pkcs11-token-serial", "", "serial number of PKCS11 token (only use one of slot, label, or serial)")
117
fs.StringVar(&cli.PKCS11KeypairLabel, "pkcs11-keypair-label", "", "label of signing keypair on PKCS11 token")
118
fs.StringVar(&cli.PKCS11KeypairID, "pkcs11-keypair-id", "", "id of signing keypair on PKCS11 token")
119
+
fs.StringVar(&cli.StreamerName, "streamer-name", "", "name of the person streaming from this streamplace node")
120
fs.StringVar(&cli.FrontendProxy, "dev-frontend-proxy", "", "(FOR DEVELOPMENT ONLY) proxy frontend requests to this address instead of using the bundled frontend")
121
cli.StringSliceFlag(fs, &cli.AllowedStreams, "allowed-streams", "", "comma-separated list of addresses or atproto DIDs that this node will replicate")
122
+
cli.StringSliceFlag(fs, &cli.Peers, "peers", "", "other streamplace nodes to replicate to")
123
cli.DebugFlag(fs, &cli.Debug, "debug", "", "modified log verbosity for specific functions or files in form func=ToHLS:3,file=gstreamer.go:4")
124
fs.BoolVar(&cli.TestStream, "test-stream", false, "run a built-in test stream on boot")
125
doValidate := fs.Bool("validate", false, "validate media")
···
152
ctx = log.WithDebugValue(ctx, cli.Debug)
153
154
log.Log(ctx,
155
+
"streamplace",
156
"version", build.Version,
157
"buildTime", build.BuildTimeStr(),
158
"uuid", build.UUID,
···
167
return media.ValidateMedia(ctx)
168
}
169
170
+
aqhttp.UserAgent = fmt.Sprintf("streamplace/%s", build.Version)
171
172
err = os.MkdirAll(cli.DataDir, os.ModePerm)
173
if err != nil {
174
+
return fmt.Errorf("error creating streamplace dir at %s:%w", cli.DataDir, err)
175
}
176
schema, err := v0.MakeV0Schema()
177
if err != nil {
···
277
if err != nil {
278
return err
279
}
280
+
a, err := api.MakeStreamplaceAPI(&cli, mod, eip712signer, noter, mm, ms)
281
if err != nil {
282
return err
283
}
+2
-2
pkg/cmd/aquareum_linux.go
pkg/cmd/streamplace_linux.go
+2
-2
pkg/cmd/aquareum_linux.go
pkg/cmd/streamplace_linux.go
+1
-1
pkg/cmd/aquareum_notlinux.go
pkg/cmd/streamplace_notlinux.go
+1
-1
pkg/cmd/aquareum_notlinux.go
pkg/cmd/streamplace_notlinux.go
+1
-1
pkg/cmd/timeoutgroup.go
+1
-1
pkg/cmd/timeoutgroup.go
+4
-4
pkg/config/config.go
+4
-4
pkg/config/config.go
···
16
"strings"
17
"time"
18
19
-
"aquareum.tv/aquareum/pkg/aqtime"
20
-
"aquareum.tv/aquareum/pkg/crypto/aqpub"
21
"github.com/peterbourgon/ff/v3"
22
"golang.org/x/exp/rand"
23
)
···
80
dataDirFlags []*string
81
}
82
83
-
var AQUAREUM_SCHEME_PREFIX = "aquareum://"
84
85
func (cli *CLI) OwnInternalURL() string {
86
// No errors because we know it's valid from AddrFlag
···
125
// not fatal unless the user doesn't set one later
126
return ""
127
}
128
-
return filepath.Join(home, ".aquareum")
129
}
130
131
func (cli *CLI) Parse(fs *flag.FlagSet, args []string) error {
···
16
"strings"
17
"time"
18
19
+
"stream.place/streamplace/pkg/aqtime"
20
+
"stream.place/streamplace/pkg/crypto/aqpub"
21
"github.com/peterbourgon/ff/v3"
22
"golang.org/x/exp/rand"
23
)
···
80
dataDirFlags []*string
81
}
82
83
+
var STREAMPLACE_SCHEME_PREFIX = "streamplace://"
84
85
func (cli *CLI) OwnInternalURL() string {
86
// No errors because we know it's valid from AddrFlag
···
125
// not fatal unless the user doesn't set one later
126
return ""
127
}
128
+
return filepath.Join(home, ".streamplace")
129
}
130
131
func (cli *CLI) Parse(fs *flag.FlagSet, args []string) error {
+1
-1
pkg/config/configtesting/configtesting.go
+1
-1
pkg/config/configtesting/configtesting.go
+9
-9
pkg/config/git/git.go
+9
-9
pkg/config/git/git.go
···
112
} else if *doBranch {
113
out = branch()
114
} else if *env {
115
-
AQUAREUM_BRANCH := branch()
116
outMap := map[string]string{}
117
-
outMap["AQUAREUM_BRANCH"] = AQUAREUM_BRANCH
118
-
outMap["AQUAREUM_VERSION"] = desc
119
-
outMap["AQUAREUM_BRANCH"] = AQUAREUM_BRANCH
120
for _, arch := range []string{"amd64", "arm64"} {
121
-
k := fmt.Sprintf("AQUAREUM_URL_LINUX_%s", strings.ToUpper(arch))
122
-
v := fmt.Sprintf("%s/packages/generic/%s/%s/aquareum-%s-linux-%s.tar.gz", gitlabURL(), AQUAREUM_BRANCH, desc, desc, arch)
123
outMap[k] = v
124
-
macK := fmt.Sprintf("AQUAREUM_URL_DARWIN_%s", strings.ToUpper(arch))
125
-
macV := fmt.Sprintf("%s/packages/generic/%s/%s/aquareum-%s-darwin-%s.zip", gitlabURL(), AQUAREUM_BRANCH, desc, desc, arch)
126
outMap[macK] = macV
127
}
128
-
outMap["AQUAREUM_DESKTOP_URL_WINDOWS_AMD64"] = fmt.Sprintf("%s/packages/generic/%s/%s/aquareum-desktop-%s-windows-amd64.exe", gitlabURL(), AQUAREUM_BRANCH, desc, desc)
129
for k, v := range outMap {
130
out = out + fmt.Sprintf("%s=%s\n", k, v)
131
}
···
112
} else if *doBranch {
113
out = branch()
114
} else if *env {
115
+
STREAMPLACE_BRANCH := branch()
116
outMap := map[string]string{}
117
+
outMap["STREAMPLACE_BRANCH"] = STREAMPLACE_BRANCH
118
+
outMap["STREAMPLACE_VERSION"] = desc
119
+
outMap["STREAMPLACE_BRANCH"] = STREAMPLACE_BRANCH
120
for _, arch := range []string{"amd64", "arm64"} {
121
+
k := fmt.Sprintf("STREAMPLACE_URL_LINUX_%s", strings.ToUpper(arch))
122
+
v := fmt.Sprintf("%s/packages/generic/%s/%s/streamplace-%s-linux-%s.tar.gz", gitlabURL(), STREAMPLACE_BRANCH, desc, desc, arch)
123
outMap[k] = v
124
+
macK := fmt.Sprintf("STREAMPLACE_URL_DARWIN_%s", strings.ToUpper(arch))
125
+
macV := fmt.Sprintf("%s/packages/generic/%s/%s/streamplace-%s-darwin-%s.zip", gitlabURL(), STREAMPLACE_BRANCH, desc, desc, arch)
126
outMap[macK] = macV
127
}
128
+
outMap["STREAMPLACE_DESKTOP_URL_WINDOWS_AMD64"] = fmt.Sprintf("%s/packages/generic/%s/%s/streamplace-desktop-%s-windows-amd64.exe", gitlabURL(), STREAMPLACE_BRANCH, desc, desc)
129
for k, v := range outMap {
130
out = out + fmt.Sprintf("%s=%s\n", k, v)
131
}
+14
-14
pkg/crypto/signers/eip712/eip712.go
+14
-14
pkg/crypto/signers/eip712/eip712.go
···
12
"strings"
13
"time"
14
15
-
"aquareum.tv/aquareum/pkg/log"
16
-
_ "aquareum.tv/aquareum/pkg/media/mediatesting"
17
-
"aquareum.tv/aquareum/pkg/schema"
18
"github.com/ethereum/go-ethereum/accounts"
19
"github.com/ethereum/go-ethereum/accounts/keystore"
20
"github.com/ethereum/go-ethereum/common"
···
144
Time() int64
145
Data() any
146
}
147
-
type AquareumEIP712 struct {
148
PrimaryType string `json:"primaryType"`
149
Domain *apitypes.TypedDataDomain `json:"domain"`
150
-
Message AquareumEIP712Message `json:"message"`
151
Signature string `json:"signature"`
152
}
153
154
-
type AquareumEIP712Message struct {
155
MsgSigner string `json:"signer"`
156
MsgTime int64 `json:"time"`
157
MsgData any `json:"data"`
158
}
159
160
// return a Map representation suitable for passing to the geth functions
161
-
func (msg AquareumEIP712Message) Map() map[string]any {
162
m := map[string]any{}
163
m["signer"] = msg.MsgSigner
164
m["time"] = new(big.Int).SetInt64(msg.MsgTime)
···
166
return m
167
}
168
169
-
func (msg *AquareumEIP712Message) Signer() string {
170
return msg.MsgSigner
171
}
172
173
-
func (msg *AquareumEIP712Message) Time() int64 {
174
return msg.MsgTime
175
}
176
177
-
func (msg *AquareumEIP712Message) Data() any {
178
return msg.MsgData
179
}
180
···
190
if err != nil {
191
return nil, err
192
}
193
-
msg := AquareumEIP712Message{
194
MsgData: innerMessage,
195
MsgSigner: signer.Account.Address.String(),
196
MsgTime: time.Now().UnixMilli(),
···
226
// golint wants string(b) but that gives /x1234 encoded output
227
sigHex := hexutil.Bytes(sig).String()
228
229
-
finalMessage := AquareumEIP712{
230
PrimaryType: name,
231
Domain: signer.EIP712Schema.Domain,
232
Message: msg,
···
257
}
258
259
func (signer *EIP712Signer) Verify(bs []byte) (SignedMessage, error) {
260
-
var unverified AquareumEIP712
261
err := json.Unmarshal(bs, &unverified)
262
if err != nil {
263
return nil, fmt.Errorf("error on json.Unmarshal: %w", err)
···
305
return nil, err
306
}
307
// new object that has the correct type hidden within!
308
-
signed := AquareumEIP712Message{
309
MsgSigner: unverified.Message.Signer(),
310
MsgTime: unverified.Message.Time(),
311
MsgData: something,
···
12
"strings"
13
"time"
14
15
+
"stream.place/streamplace/pkg/log"
16
+
_ "stream.place/streamplace/pkg/media/mediatesting"
17
+
"stream.place/streamplace/pkg/schema"
18
"github.com/ethereum/go-ethereum/accounts"
19
"github.com/ethereum/go-ethereum/accounts/keystore"
20
"github.com/ethereum/go-ethereum/common"
···
144
Time() int64
145
Data() any
146
}
147
+
type StreamplaceEIP712 struct {
148
PrimaryType string `json:"primaryType"`
149
Domain *apitypes.TypedDataDomain `json:"domain"`
150
+
Message StreamplaceEIP712Message `json:"message"`
151
Signature string `json:"signature"`
152
}
153
154
+
type StreamplaceEIP712Message struct {
155
MsgSigner string `json:"signer"`
156
MsgTime int64 `json:"time"`
157
MsgData any `json:"data"`
158
}
159
160
// return a Map representation suitable for passing to the geth functions
161
+
func (msg StreamplaceEIP712Message) Map() map[string]any {
162
m := map[string]any{}
163
m["signer"] = msg.MsgSigner
164
m["time"] = new(big.Int).SetInt64(msg.MsgTime)
···
166
return m
167
}
168
169
+
func (msg *StreamplaceEIP712Message) Signer() string {
170
return msg.MsgSigner
171
}
172
173
+
func (msg *StreamplaceEIP712Message) Time() int64 {
174
return msg.MsgTime
175
}
176
177
+
func (msg *StreamplaceEIP712Message) Data() any {
178
return msg.MsgData
179
}
180
···
190
if err != nil {
191
return nil, err
192
}
193
+
msg := StreamplaceEIP712Message{
194
MsgData: innerMessage,
195
MsgSigner: signer.Account.Address.String(),
196
MsgTime: time.Now().UnixMilli(),
···
226
// golint wants string(b) but that gives /x1234 encoded output
227
sigHex := hexutil.Bytes(sig).String()
228
229
+
finalMessage := StreamplaceEIP712{
230
PrimaryType: name,
231
Domain: signer.EIP712Schema.Domain,
232
Message: msg,
···
257
}
258
259
func (signer *EIP712Signer) Verify(bs []byte) (SignedMessage, error) {
260
+
var unverified StreamplaceEIP712
261
err := json.Unmarshal(bs, &unverified)
262
if err != nil {
263
return nil, fmt.Errorf("error on json.Unmarshal: %w", err)
···
305
return nil, err
306
}
307
// new object that has the correct type hidden within!
308
+
signed := StreamplaceEIP712Message{
309
MsgSigner: unverified.Message.Signer(),
310
MsgTime: unverified.Message.Time(),
311
MsgData: something,
+42
-43
pkg/crypto/signers/eip712/eip712_test.go
+42
-43
pkg/crypto/signers/eip712/eip712_test.go
···
1
package eip712_test
2
3
import (
4
-
"strings"
5
"testing"
6
"time"
7
8
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712"
9
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712/eip712test"
10
-
v0 "aquareum.tv/aquareum/pkg/schema/v0"
11
"github.com/stretchr/testify/require"
12
)
13
14
func TestEIP712Map(t *testing.T) {
15
-
msg := eip712.AquareumEIP712Message{
16
MsgData: map[string]string{"foo": "bar"},
17
MsgSigner: "0x295481766f43bb048aec5d71f3bf76fdacea78f2",
18
MsgTime: time.Now().UnixMilli(),
···
40
})
41
}
42
43
-
var testCase = `{
44
-
"primaryType": "Identity",
45
-
"domain": {
46
-
"name": "Aquareum",
47
-
"version": "0.0.1",
48
-
"chainId": null,
49
-
"verifyingContract": "",
50
-
"salt": ""
51
-
},
52
-
"message": {
53
-
"signer": "0x9153c114d47aceb691b77b02122cb378074e45c8",
54
-
"time": 1732561417949,
55
-
"data": {
56
-
"handle": "aquareum.bsky.social",
57
-
"did": "did:plc:dkh4rwafdcda4ko7lewe43ml"
58
-
}
59
-
},
60
-
"signature": "0xc75ca7da2d110c562eaa4a906aae7a246b2d96a867b74baf3ac0d9127f260dfb17b9aba7d20562c10c771b658c17a4be2dfc427c3e729a07853e35753a8a70f61b"
61
-
}`
62
63
-
func TestVerifyIdentity(t *testing.T) {
64
-
eip712test.WithTestSigner(func(signer *eip712.EIP712Signer) {
65
-
signed, err := signer.Verify([]byte(testCase))
66
-
require.NoError(t, err)
67
-
require.Equal(t, signed.Signer(), "0x9153c114d47aceb691b77b02122cb378074e45c8")
68
-
require.Equal(t, signed.Time(), int64(1732561417949))
69
-
identity, ok := signed.Data().(*v0.Identity)
70
-
require.True(t, ok)
71
-
require.Equal(t, identity.Handle, "aquareum.bsky.social")
72
-
require.Equal(t, identity.DID, "did:plc:dkh4rwafdcda4ko7lewe43ml")
73
-
})
74
-
}
75
76
-
func TestFailingGoLive(t *testing.T) {
77
-
eip712test.WithTestSigner(func(signer *eip712.EIP712Signer) {
78
-
failingTestCase := strings.Replace(testCase, "aquareum.bsky.social", "evilhandle.evil", 1)
79
-
_, err := signer.Verify([]byte(failingTestCase))
80
-
require.Error(t, err)
81
-
})
82
-
}
···
1
package eip712_test
2
3
import (
4
"testing"
5
"time"
6
7
"github.com/stretchr/testify/require"
8
+
"stream.place/streamplace/pkg/crypto/signers/eip712"
9
+
"stream.place/streamplace/pkg/crypto/signers/eip712/eip712test"
10
+
v0 "stream.place/streamplace/pkg/schema/v0"
11
)
12
13
func TestEIP712Map(t *testing.T) {
14
+
msg := eip712.StreamplaceEIP712Message{
15
MsgData: map[string]string{"foo": "bar"},
16
MsgSigner: "0x295481766f43bb048aec5d71f3bf76fdacea78f2",
17
MsgTime: time.Now().UnixMilli(),
···
39
})
40
}
41
42
+
// var testCase = `{
43
+
// "primaryType": "Identity",
44
+
// "domain": {
45
+
// "name": "Aquareum",
46
+
// "version": "0.0.1",
47
+
// "chainId": null,
48
+
// "verifyingContract": "",
49
+
// "salt": ""
50
+
// },
51
+
// "message": {
52
+
// "signer": "0x9153c114d47aceb691b77b02122cb378074e45c8",
53
+
// "time": 1732561417949,
54
+
// "data": {
55
+
// "handle": "aquareum.bsky.social",
56
+
// "did": "did:plc:dkh4rwafdcda4ko7lewe43ml"
57
+
// }
58
+
// },
59
+
// "signature": "0xc75ca7da2d110c562eaa4a906aae7a246b2d96a867b74baf3ac0d9127f260dfb17b9aba7d20562c10c771b658c17a4be2dfc427c3e729a07853e35753a8a70f61b"
60
+
// }`
61
62
+
// func TestVerifyIdentity(t *testing.T) {
63
+
// eip712test.WithTestSigner(func(signer *eip712.EIP712Signer) {
64
+
// signed, err := signer.Verify([]byte(testCase))
65
+
// require.NoError(t, err)
66
+
// require.Equal(t, signed.Signer(), "0x9153c114d47aceb691b77b02122cb378074e45c8")
67
+
// require.Equal(t, signed.Time(), int64(1732561417949))
68
+
// identity, ok := signed.Data().(*v0.Identity)
69
+
// require.True(t, ok)
70
+
// require.Equal(t, identity.Handle, "aquareum.bsky.social")
71
+
// require.Equal(t, identity.DID, "did:plc:dkh4rwafdcda4ko7lewe43ml")
72
+
// })
73
+
// }
74
75
+
// func TestFailingGoLive(t *testing.T) {
76
+
// eip712test.WithTestSigner(func(signer *eip712.EIP712Signer) {
77
+
// failingTestCase := strings.Replace(testCase, "aquareum.bsky.social", "evilhandle.evil", 1)
78
+
// _, err := signer.Verify([]byte(failingTestCase))
79
+
// require.Error(t, err)
80
+
// })
81
+
// }
+2
-2
pkg/crypto/signers/eip712/eip712test/eip712test.go
+2
-2
pkg/crypto/signers/eip712/eip712test/eip712test.go
+1
-1
pkg/crypto/signers/eip712/export-schema/export-schema.go
+1
-1
pkg/crypto/signers/eip712/export-schema/export-schema.go
+2
-2
pkg/crypto/signers/signers.go
+2
-2
pkg/crypto/signers/signers.go
+1
-1
pkg/errors/errors.go
+1
-1
pkg/errors/errors.go
+2
-2
pkg/log/log.go
+2
-2
pkg/log/log.go
···
205
return glog.V(level)
206
}
207
208
-
// returns filenames relative to aquareum root
209
// e.g. handlers/misttriggers/triggers.go:58
210
func caller(depth int) string {
211
_, myfile, _, _ := runtime.Caller(0)
212
-
// This assumes that the root directory of aquareum is two levels above this folder.
213
// If that changes, please update this rootDir resolution.
214
rootDir := filepath.Join(filepath.Dir(myfile), "..", "..")
215
_, file, line, _ := runtime.Caller(depth)
···
205
return glog.V(level)
206
}
207
208
+
// returns filenames relative to streamplace root
209
// e.g. handlers/misttriggers/triggers.go:58
210
func caller(depth int) string {
211
_, myfile, _, _ := runtime.Caller(0)
212
+
// This assumes that the root directory of streamplace is two levels above this folder.
213
// If that changes, please update this rootDir resolution.
214
rootDir := filepath.Join(filepath.Dir(myfile), "..", "..")
215
_, file, line, _ := runtime.Caller(depth)
+1
-1
pkg/media/concat.go
+1
-1
pkg/media/concat.go
+3
-3
pkg/media/gstreamer.go
+3
-3
pkg/media/gstreamer.go
+1
-1
pkg/media/gstreamer_test.go
+1
-1
pkg/media/gstreamer_test.go
+1
-1
pkg/media/m3u8.go
+1
-1
pkg/media/m3u8.go
+12
-11
pkg/media/media.go
+12
-11
pkg/media/media.go
···
10
"io"
11
"sync"
12
13
-
"aquareum.tv/aquareum/pkg/aqtime"
14
-
"aquareum.tv/aquareum/pkg/config"
15
-
"aquareum.tv/aquareum/pkg/crypto/signers"
16
-
"aquareum.tv/aquareum/pkg/log"
17
-
"aquareum.tv/aquareum/pkg/model"
18
-
"aquareum.tv/aquareum/pkg/replication"
19
"github.com/go-gst/go-gst/gst"
20
"github.com/google/uuid"
21
"github.com/livepeer/lpms/ffmpeg"
22
"golang.org/x/sync/errgroup"
23
24
-
"git.aquareum.tv/aquareum-tv/c2pa-go/pkg/c2pa"
25
-
"git.aquareum.tv/aquareum-tv/c2pa-go/pkg/c2pa/generated/manifeststore"
26
"github.com/piprate/json-gold/ld"
27
)
28
29
const CERT_FILE = "cert.pem"
30
const SEGMENTS_DIR = "segments"
31
-
const AQUAREUM_METADATA = "tv.aquareum.metadata"
32
33
type MediaManager struct {
34
cli *config.CLI
···
269
func ParseSegmentAssertions(mani *manifeststore.Manifest) (*SegmentMetadata, error) {
270
var ass *manifeststore.ManifestAssertion
271
for _, a := range mani.Assertions {
272
-
if a.Label == AQUAREUM_METADATA {
273
ass = &a
274
break
275
}
276
}
277
if ass == nil {
278
-
return nil, fmt.Errorf("couldn't find %s assertions", AQUAREUM_METADATA)
279
}
280
proc := ld.NewJsonLdProcessor()
281
options := ld.NewJsonLdOptions("")
···
10
"io"
11
"sync"
12
13
"github.com/go-gst/go-gst/gst"
14
"github.com/google/uuid"
15
"github.com/livepeer/lpms/ffmpeg"
16
"golang.org/x/sync/errgroup"
17
+
"stream.place/streamplace/pkg/aqtime"
18
+
"stream.place/streamplace/pkg/config"
19
+
"stream.place/streamplace/pkg/crypto/signers"
20
+
"stream.place/streamplace/pkg/log"
21
+
"stream.place/streamplace/pkg/model"
22
+
"stream.place/streamplace/pkg/replication"
23
24
+
"git.aquareum.tv/streamplace/c2pa-go/pkg/c2pa"
25
+
"git.aquareum.tv/streamplace/c2pa-go/pkg/c2pa/generated/manifeststore"
26
"github.com/piprate/json-gold/ld"
27
)
28
29
const CERT_FILE = "cert.pem"
30
const SEGMENTS_DIR = "segments"
31
+
32
+
var STREAMPLACE_METADATA = "place.stream.metadata"
33
34
type MediaManager struct {
35
cli *config.CLI
···
270
func ParseSegmentAssertions(mani *manifeststore.Manifest) (*SegmentMetadata, error) {
271
var ass *manifeststore.ManifestAssertion
272
for _, a := range mani.Assertions {
273
+
if a.Label == STREAMPLACE_METADATA {
274
ass = &a
275
break
276
}
277
}
278
if ass == nil {
279
+
return nil, fmt.Errorf("couldn't find %s assertions", STREAMPLACE_METADATA)
280
}
281
proc := ld.NewJsonLdProcessor()
282
options := ld.NewJsonLdOptions("")
+9
-9
pkg/media/media_signer.go
+9
-9
pkg/media/media_signer.go
···
10
"io"
11
"path/filepath"
12
13
-
"aquareum.tv/aquareum/pkg/aqio"
14
-
"aquareum.tv/aquareum/pkg/aqtime"
15
-
"aquareum.tv/aquareum/pkg/config"
16
-
"aquareum.tv/aquareum/pkg/crypto/aqpub"
17
-
"aquareum.tv/aquareum/pkg/crypto/signers"
18
-
"aquareum.tv/aquareum/pkg/log"
19
-
"aquareum.tv/aquareum/pkg/model"
20
-
"git.aquareum.tv/aquareum-tv/c2pa-go/pkg/c2pa"
21
)
22
23
type MediaSigner struct {
···
79
},
80
},
81
{
82
-
"label": "tv.aquareum.metadata",
83
"data": obj{
84
"@context": obj{
85
"dc": "http://purl.org/dc/elements/1.1/",
···
10
"io"
11
"path/filepath"
12
13
+
"git.aquareum.tv/streamplace/c2pa-go/pkg/c2pa"
14
+
"stream.place/streamplace/pkg/aqio"
15
+
"stream.place/streamplace/pkg/aqtime"
16
+
"stream.place/streamplace/pkg/config"
17
+
"stream.place/streamplace/pkg/crypto/aqpub"
18
+
"stream.place/streamplace/pkg/crypto/signers"
19
+
"stream.place/streamplace/pkg/log"
20
+
"stream.place/streamplace/pkg/model"
21
)
22
23
type MediaSigner struct {
···
79
},
80
},
81
{
82
+
"label": STREAMPLACE_METADATA,
83
"data": obj{
84
"@context": obj{
85
"dc": "http://purl.org/dc/elements/1.1/",
+10
-7
pkg/media/media_test.go
+10
-7
pkg/media/media_test.go
···
7
"runtime"
8
"testing"
9
10
-
"aquareum.tv/aquareum/pkg/config"
11
-
ct "aquareum.tv/aquareum/pkg/config/configtesting"
12
-
"aquareum.tv/aquareum/pkg/crypto/aqpub"
13
-
"aquareum.tv/aquareum/pkg/crypto/signers/eip712/eip712test"
14
-
_ "aquareum.tv/aquareum/pkg/media/mediatesting"
15
-
"aquareum.tv/aquareum/pkg/replication/boring"
16
-
"git.aquareum.tv/aquareum-tv/c2pa-go/pkg/c2pa"
17
"github.com/stretchr/testify/require"
18
)
19
20
func getFixture(name string) string {
···
116
// }
117
118
func TestVerifyMP4(t *testing.T) {
119
f, err := os.Open(getFixture("sample-segment.mp4"))
120
require.NoError(t, err)
121
mm, _ := getStaticTestMediaManager(t)
···
7
"runtime"
8
"testing"
9
10
+
"git.aquareum.tv/streamplace/c2pa-go/pkg/c2pa"
11
"github.com/stretchr/testify/require"
12
+
"stream.place/streamplace/pkg/config"
13
+
ct "stream.place/streamplace/pkg/config/configtesting"
14
+
"stream.place/streamplace/pkg/crypto/aqpub"
15
+
"stream.place/streamplace/pkg/crypto/signers/eip712/eip712test"
16
+
_ "stream.place/streamplace/pkg/media/mediatesting"
17
+
"stream.place/streamplace/pkg/replication/boring"
18
)
19
20
func getFixture(name string) string {
···
116
// }
117
118
func TestVerifyMP4(t *testing.T) {
119
+
oldStreamplaceMetadata := STREAMPLACE_METADATA
120
+
STREAMPLACE_METADATA = "tv.aquareum.metadata"
121
+
defer func() { STREAMPLACE_METADATA = oldStreamplaceMetadata }()
122
f, err := os.Open(getFixture("sample-segment.mp4"))
123
require.NoError(t, err)
124
mm, _ := getStaticTestMediaManager(t)
+51
-51
pkg/media/media_validator.go
+51
-51
pkg/media/media_validator.go
···
6
"strings"
7
"time"
8
9
-
"aquareum.tv/aquareum/pkg/log"
10
"github.com/go-gst/go-gst/gst"
11
"github.com/go-gst/go-gst/gst/app"
12
"github.com/pion/webrtc/v4/pkg/media"
···
17
}
18
19
// var files []string = []string{
20
-
// // "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-00-411Z.mp4",
21
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-01-212Z.mp4",
22
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-01-830Z.mp4",
23
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-02-492Z.mp4",
24
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-03-163Z.mp4",
25
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-03-430Z.mp4",
26
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-04-209Z.mp4",
27
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-04-604Z.mp4",
28
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-05-308Z.mp4",
29
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-05-970Z.mp4",
30
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-06-406Z.mp4",
31
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-07-271Z.mp4",
32
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-07-868Z.mp4",
33
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-08-572Z.mp4",
34
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-09-286Z.mp4",
35
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-09-404Z.mp4",
36
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-10-289Z.mp4",
37
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-11-431Z.mp4",
38
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-12-390Z.mp4",
39
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-13-585Z.mp4",
40
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-14-588Z.mp4",
41
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-15-409Z.mp4",
42
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-17-372Z.mp4",
43
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-18-407Z.mp4",
44
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-19-025Z.mp4",
45
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-19-591Z.mp4",
46
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-20-369Z.mp4",
47
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-20-967Z.mp4",
48
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-21-393Z.mp4",
49
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-21-970Z.mp4",
50
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-22-812Z.mp4",
51
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-24-391Z.mp4",
52
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-24-988Z.mp4",
53
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-25-606Z.mp4",
54
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-26-310Z.mp4",
55
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-27-333Z.mp4",
56
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-27-452Z.mp4",
57
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-28-305Z.mp4",
58
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-29-052Z.mp4",
59
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-29-607Z.mp4",
60
-
// "/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-30-407Z.mp4",
61
// }
62
63
var files []string = []string{
64
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-00-459Z.mp4", // evil
65
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-03-424Z.mp4", // good
66
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-04-661Z.mp4", // good
67
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-07-121Z.mp4", // good
68
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-11-285Z.mp4", // good
69
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-12-938Z.mp4", // evil
70
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-17-343Z.mp4", // evil
71
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-19-158Z.mp4", // good
72
-
"/home/iameli/.aquareum/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-22-261Z.mp4", // good
73
// "/home/iameli/Desktop/out/2025-01-15T23-29-00-459Z.mp4.mkv.mp4",
74
// "/home/iameli/Desktop/out/2025-01-15T23-29-03-424Z.mp4.mkv.mp4",
75
// "/home/iameli/Desktop/out/2025-01-15T23-29-04-661Z.mp4.mkv.mp4",
···
6
"strings"
7
"time"
8
9
+
"stream.place/streamplace/pkg/log"
10
"github.com/go-gst/go-gst/gst"
11
"github.com/go-gst/go-gst/gst/app"
12
"github.com/pion/webrtc/v4/pkg/media"
···
17
}
18
19
// var files []string = []string{
20
+
// // "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-00-411Z.mp4",
21
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-01-212Z.mp4",
22
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-01-830Z.mp4",
23
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-02-492Z.mp4",
24
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-03-163Z.mp4",
25
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-03-430Z.mp4",
26
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-04-209Z.mp4",
27
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-04-604Z.mp4",
28
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-05-308Z.mp4",
29
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-05-970Z.mp4",
30
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-06-406Z.mp4",
31
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-07-271Z.mp4",
32
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-07-868Z.mp4",
33
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-08-572Z.mp4",
34
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-09-286Z.mp4",
35
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-09-404Z.mp4",
36
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-10-289Z.mp4",
37
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-11-431Z.mp4",
38
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-12-390Z.mp4",
39
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-13-585Z.mp4",
40
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-14-588Z.mp4",
41
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-15-409Z.mp4",
42
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-17-372Z.mp4",
43
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-18-407Z.mp4",
44
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-19-025Z.mp4",
45
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-19-591Z.mp4",
46
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-20-369Z.mp4",
47
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-20-967Z.mp4",
48
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-21-393Z.mp4",
49
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-21-970Z.mp4",
50
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-22-812Z.mp4",
51
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-24-391Z.mp4",
52
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-24-988Z.mp4",
53
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-25-606Z.mp4",
54
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-26-310Z.mp4",
55
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-27-333Z.mp4",
56
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-27-452Z.mp4",
57
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-28-305Z.mp4",
58
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-29-052Z.mp4",
59
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-29-607Z.mp4",
60
+
// "/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/22/18/2025-01-15T22-18-30-407Z.mp4",
61
// }
62
63
var files []string = []string{
64
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-00-459Z.mp4", // evil
65
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-03-424Z.mp4", // good
66
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-04-661Z.mp4", // good
67
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-07-121Z.mp4", // good
68
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-11-285Z.mp4", // good
69
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-12-938Z.mp4", // evil
70
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-17-343Z.mp4", // evil
71
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-19-158Z.mp4", // good
72
+
"/home/iameli/.streamplace/segments/0x3371a9b874d9815c8d18e7d4662cda099a4737b2/2025/01/15/23/29/2025-01-15T23-29-22-261Z.mp4", // good
73
// "/home/iameli/Desktop/out/2025-01-15T23-29-00-459Z.mp4.mkv.mp4",
74
// "/home/iameli/Desktop/out/2025-01-15T23-29-03-424Z.mp4.mkv.mp4",
75
// "/home/iameli/Desktop/out/2025-01-15T23-29-04-661Z.mp4.mkv.mp4",
+1
-1
pkg/media/mediatesting/mediatesting.go
+1
-1
pkg/media/mediatesting/mediatesting.go
+1
-1
pkg/media/text.go
+1
-1
pkg/media/text.go
+1
-1
pkg/media/webrtc.go
+1
-1
pkg/media/webrtc.go
+5
-5
pkg/mist/mistconfig/mistconfig.go
+5
-5
pkg/mist/mistconfig/mistconfig.go
···
6
"fmt"
7
"os"
8
9
-
"aquareum.tv/aquareum/pkg/config"
10
-
"aquareum.tv/aquareum/pkg/mist/misttriggers"
11
)
12
13
var STREAM_NAME = "stream"
···
28
conf := map[string]any{
29
"account": map[string]any{
30
// doesn't need to be secure, will only ever be exposed on localhost
31
-
"aquareum": map[string]any{
32
-
"password": md5.Sum([]byte("aquareum")),
33
},
34
},
35
"bandwidth": map[string]any{
···
43
},
44
"config": map[string]any{
45
"accesslog": "LOG",
46
-
"prometheus": "aquareum",
47
"protocols": []map[string]any{
48
{"connector": "AAC"},
49
{"connector": "CMAF"},
···
6
"fmt"
7
"os"
8
9
+
"stream.place/streamplace/pkg/config"
10
+
"stream.place/streamplace/pkg/mist/misttriggers"
11
)
12
13
var STREAM_NAME = "stream"
···
28
conf := map[string]any{
29
"account": map[string]any{
30
// doesn't need to be secure, will only ever be exposed on localhost
31
+
"streamplace": map[string]any{
32
+
"password": md5.Sum([]byte("streamplace")),
33
},
34
},
35
"bandwidth": map[string]any{
···
43
},
44
"config": map[string]any{
45
"accesslog": "LOG",
46
+
"prometheus": "streamplace",
47
"protocols": []map[string]any{
48
{"connector": "AAC"},
49
{"connector": "CMAF"},
+3
-3
pkg/mist/misttriggers/live_track_list.go
+3
-3
pkg/mist/misttriggers/live_track_list.go
+1
-1
pkg/mist/misttriggers/live_track_list_test.go
+1
-1
pkg/mist/misttriggers/live_track_list_test.go
+2
-2
pkg/mist/misttriggers/push_end.go
+2
-2
pkg/mist/misttriggers/push_end.go
+1
-1
pkg/mist/misttriggers/push_end_test.go
+1
-1
pkg/mist/misttriggers/push_end_test.go
+1
-1
pkg/mist/misttriggers/push_out_start.go
+1
-1
pkg/mist/misttriggers/push_out_start.go
+1
-1
pkg/mist/misttriggers/push_out_start_test.go
+1
-1
pkg/mist/misttriggers/push_out_start_test.go
+1
-1
pkg/mist/misttriggers/push_rewrite.go
+1
-1
pkg/mist/misttriggers/push_rewrite.go
+1
-1
pkg/mist/misttriggers/push_rewrite_test.go
+1
-1
pkg/mist/misttriggers/push_rewrite_test.go
+1
-1
pkg/mist/misttriggers/stream_buffer.go
+1
-1
pkg/mist/misttriggers/stream_buffer.go
+1
-1
pkg/mist/misttriggers/stream_source.go
+1
-1
pkg/mist/misttriggers/stream_source.go
+1
-1
pkg/mist/misttriggers/stream_source_test.go
+1
-1
pkg/mist/misttriggers/stream_source_test.go
+3
-3
pkg/mist/misttriggers/triggers.go
+3
-3
pkg/mist/misttriggers/triggers.go
+1
-1
pkg/mist/misttriggers/user_end_test.go
+1
-1
pkg/mist/misttriggers/user_end_test.go
+1
-1
pkg/mist/misttriggers/user_new.go
+1
-1
pkg/mist/misttriggers/user_new.go
+1
-1
pkg/mist/misttriggers/user_new_test.go
+1
-1
pkg/mist/misttriggers/user_new_test.go
+1
-1
pkg/model/model.go
+1
-1
pkg/model/model.go
+1
-1
pkg/model/segment.go
+1
-1
pkg/model/segment.go
+2
-2
pkg/notifications/firebase.go
+2
-2
pkg/notifications/firebase.go
+3
-3
pkg/proc/proc.go
+3
-3
pkg/proc/proc.go
+2
-2
pkg/replication/boring/boring.go
+2
-2
pkg/replication/boring/boring.go
+2
-2
pkg/schema/v0/golive.go
+2
-2
pkg/schema/v0/golive.go
+1
-1
subprojects/FFmpeg.wrap
+1
-1
subprojects/FFmpeg.wrap
+1
-1
subprojects/c2pa_go.wrap
+1
-1
subprojects/c2pa_go.wrap
+2
-2
subprojects/mistserver.wrap
+2
-2
subprojects/mistserver.wrap
+2
-2
util/mac-build.sh
+2
-2
util/mac-build.sh
···
10
mkdir ~/build
11
cd ~/build
12
source '/Volumes/My Shared Files/signing/mac-codesigning.env'
13
-
git clone '/Volumes/My Shared Files/aquareum'
14
eval "$(/opt/homebrew/bin/brew shellenv)"
15
brew update --force --quiet
16
-
cd ~/build/aquareum
17
brew install ninja go openssl@3 cocoapods git && go version
18
sudo gem install --user-install xcpretty
19
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && bash rustup.sh -y && rm rustup.sh
···
10
mkdir ~/build
11
cd ~/build
12
source '/Volumes/My Shared Files/signing/mac-codesigning.env'
13
+
git clone '/Volumes/My Shared Files/streamplace'
14
eval "$(/opt/homebrew/bin/brew shellenv)"
15
brew update --force --quiet
16
+
cd ~/build/streamplace
17
brew install ninja go openssl@3 cocoapods git && go version
18
sudo gem install --user-install xcpretty
19
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && bash rustup.sh -y && rm rustup.sh
+1
-1
util/mac-codesign.sh
+1
-1
util/mac-codesign.sh
+1
-1
util/mac-tart-build.sh
+1
-1
util/mac-tart-build.sh
···
8
tart list --format json | jq -r '.[] | select(.State == "running") | .Name' | xargs -L 1 tart stop
9
IMAGE=sonoma-$(date +%s)
10
tart clone ghcr.io/cirruslabs/macos-runner:sonoma $IMAGE
11
-
bash -c "tart run $IMAGE --no-graphics --dir=aquareum:$DIR --dir=signing:/Volumes/UnlockedKey &"
12
while ! tart ip $IMAGE; do echo 'waiting for ip...' && sleep 1; done;
13
export EXIT="0"
14
cat util/mac-build.sh | sshpass -p admin ssh -o "StrictHostKeyChecking no" admin@$(tart ip $IMAGE) bash -c 'cat > mac-build.sh && bash mac-build.sh' || export EXIT=1
···
8
tart list --format json | jq -r '.[] | select(.State == "running") | .Name' | xargs -L 1 tart stop
9
IMAGE=sonoma-$(date +%s)
10
tart clone ghcr.io/cirruslabs/macos-runner:sonoma $IMAGE
11
+
bash -c "tart run $IMAGE --no-graphics --dir=streamplace:$DIR --dir=signing:/Volumes/UnlockedKey &"
12
while ! tart ip $IMAGE; do echo 'waiting for ip...' && sleep 1; done;
13
export EXIT="0"
14
cat util/mac-build.sh | sshpass -p admin ssh -o "StrictHostKeyChecking no" admin@$(tart ip $IMAGE) bash -c 'cat > mac-build.sh && bash mac-build.sh' || export EXIT=1
+5
-5
util/windows-selftest.sh
+5
-5
util/windows-selftest.sh
+140
-140
yarn.lock
+140
-140
yarn.lock
···
11321
languageName: node
11322
linkType: hard
11323
11324
-
"aquareum-desktop@workspace:js/desktop":
11325
-
version: 0.0.0-use.local
11326
-
resolution: "aquareum-desktop@workspace:js/desktop"
11327
-
dependencies:
11328
-
"@atproto/crypto": "npm:^0.4.3"
11329
-
"@electron-forge/cli": "npm:^7.5.0"
11330
-
"@electron-forge/maker-deb": "npm:^7.5.0"
11331
-
"@electron-forge/maker-dmg": "npm:^7.5.0"
11332
-
"@electron-forge/maker-rpm": "npm:^7.5.0"
11333
-
"@electron-forge/maker-squirrel": "npm:^7.5.0"
11334
-
"@electron-forge/maker-zip": "npm:^7.5.0"
11335
-
"@electron-forge/plugin-auto-unpack-natives": "npm:^7.5.0"
11336
-
"@electron-forge/plugin-fuses": "npm:^7.5.0"
11337
-
"@electron-forge/plugin-webpack": "npm:^7.5.0"
11338
-
"@electron-forge/publisher-s3": "npm:^7.5.0"
11339
-
"@electron/fuses": "npm:^1.8.0"
11340
-
"@reforged/maker-appimage": "https://gitpkg.vercel.app/aquareum-tv/ReForged/makers/appimage?90c4b7e8449250fe2a83fb2df0f41a3fcc1b37ca"
11341
-
"@types/source-map-support": "npm:^0.5.10"
11342
-
"@typescript-eslint/eslint-plugin": "npm:^8.13.0"
11343
-
"@typescript-eslint/parser": "npm:^8.13.0"
11344
-
"@vercel/webpack-asset-relocator-loader": "npm:1.7.3"
11345
-
css-loader: "npm:^7.1.2"
11346
-
electron: "npm:33.0.2"
11347
-
electron-squirrel-startup: "npm:^1.0.1"
11348
-
eslint: "npm:^9.14.0"
11349
-
eslint-plugin-import: "npm:^2.31.0"
11350
-
fork-ts-checker-webpack-plugin: "npm:^9.0.2"
11351
-
node-loader: "npm:^2.0.0"
11352
-
source-map-support: "npm:^0.5.21"
11353
-
style-loader: "npm:^4.0.0"
11354
-
ts-loader: "npm:^9.5.1"
11355
-
ts-node: "npm:^10.9.2"
11356
-
typescript: "npm:~5.6.3"
11357
-
update-electron-app: "npm:^3.0.0"
11358
-
viem: "npm:^2.21.44"
11359
-
languageName: unknown
11360
-
linkType: soft
11361
-
11362
-
"aquareum-monorepo@workspace:.":
11363
-
version: 0.0.0-use.local
11364
-
resolution: "aquareum-monorepo@workspace:."
11365
-
dependencies:
11366
-
"@atproto/api": "npm:^0.13.16"
11367
-
"@atproto/jwk-webcrypto": "npm:^0.1.2"
11368
-
"@atproto/oauth-client-browser": "npm:^0.3.1"
11369
-
firebase-admin: "npm:^12.7.0"
11370
-
husky: "npm:^9.1.6"
11371
-
lerna: "npm:^8.1.9"
11372
-
lint-staged: "npm:^15.2.10"
11373
-
prettier: "npm:^3.3.3"
11374
-
languageName: unknown
11375
-
linkType: soft
11376
-
11377
-
"aquareum@workspace:js/app":
11378
-
version: 0.0.0-use.local
11379
-
resolution: "aquareum@workspace:js/app"
11380
-
dependencies:
11381
-
"@aquareum/atproto-oauth-client-react-native": "npm:^0.0.1"
11382
-
"@atproto-labs/pipe": "npm:^0.1.0"
11383
-
"@atproto/crypto": "npm:^0.4.2"
11384
-
"@atproto/jwk-jose": "npm:^0.1.2"
11385
-
"@atproto/oauth-client": "npm:^0.3.1"
11386
-
"@babel/core": "npm:^7.26.0"
11387
-
"@babel/plugin-proposal-export-default-from": "npm:^7.25.9"
11388
-
"@babel/plugin-syntax-export-default-from": "npm:^7.25.9"
11389
-
"@babel/plugin-transform-flow-strip-types": "npm:^7.25.9"
11390
-
"@babel/plugin-transform-private-methods": "npm:^7.25.9"
11391
-
"@babel/plugin-transform-private-property-in-object": "npm:^7.25.9"
11392
-
"@babel/plugin-transform-runtime": "npm:^7.25.9"
11393
-
"@bacons/text-decoder": "npm:^0.0.0"
11394
-
"@config-plugins/react-native-webrtc": "npm:^10.0.0"
11395
-
"@expo/metro-config": "npm:~0.19.0"
11396
-
"@expo/metro-runtime": "npm:~4.0.0"
11397
-
"@rainbow-me/rainbowkit": "npm:2.2.0"
11398
-
"@react-native-firebase/app": "npm:^21.3.0"
11399
-
"@react-native-firebase/messaging": "npm:^21.3.0"
11400
-
"@react-navigation/bottom-tabs": "npm:^6.6.1"
11401
-
"@react-navigation/drawer": "npm:^6.7.2"
11402
-
"@react-navigation/native": "npm:^6.1.18"
11403
-
"@react-navigation/native-stack": "npm:^6.11.0"
11404
-
"@reduxjs/toolkit": "npm:^2.3.0"
11405
-
"@tamagui/babel-plugin": "npm:^1.116.12"
11406
-
"@tamagui/config": "npm:^1.116.12"
11407
-
"@tamagui/lucide-icons": "npm:^1.116.12"
11408
-
"@tamagui/metro-plugin": "npm:^1.116.12"
11409
-
"@tamagui/toast": "npm:^1.116.12"
11410
-
"@tanstack/react-query": "npm:^5.59.19"
11411
-
"@types/babel__plugin-transform-runtime": "npm:^7"
11412
-
"@types/qrcode": "npm:^1"
11413
-
"@types/react": "npm:~18.3.12"
11414
-
"@types/uuid": "npm:^10.0.0"
11415
-
"@zxing/browser": "npm:^0.1.5"
11416
-
"@zxing/library": "npm:^0.21.3"
11417
-
abortcontroller-polyfill: "npm:^1.7.6"
11418
-
babel-preset-expo: "npm:~12.0.0"
11419
-
burnt: "npm:^0.12.2"
11420
-
chrono-node: "npm:^2.7.7"
11421
-
event-target-shim: "npm:^6.0.2"
11422
-
expo: "npm:~52.0.8"
11423
-
expo-build-properties: "npm:~0.13.1"
11424
-
expo-dev-client: "npm:~5.0.3"
11425
-
expo-file-system: "npm:~18.0.4"
11426
-
expo-font: "npm:~13.0.1"
11427
-
expo-linking: "npm:~7.0.3"
11428
-
expo-notifications: "npm:~0.29.8"
11429
-
expo-splash-screen: "npm:~0.29.11"
11430
-
expo-sqlite: "npm:~15.0.3"
11431
-
expo-status-bar: "npm:~2.0.0"
11432
-
expo-system-ui: "npm:~4.0.3"
11433
-
expo-updates: "npm:~0.26.7"
11434
-
expo-video: "npm:~2.0.1"
11435
-
expo-web-browser: "npm:^14.0.1"
11436
-
hls.js: "npm:^1.5.17"
11437
-
jose: "npm:^5.9.6"
11438
-
multiformats: "npm:^13.3.1"
11439
-
qrcode: "npm:^1.5.4"
11440
-
quietjs-bundle: "npm:^0.1.3"
11441
-
react: "npm:18.3.1"
11442
-
react-dom: "npm:18.3.1"
11443
-
react-native: "npm:0.76.2"
11444
-
react-native-gesture-handler: "npm:~2.20.2"
11445
-
react-native-markdown-display: "npm:^7.0.2"
11446
-
react-native-quick-crypto: "npm:^0.7.7"
11447
-
react-native-reanimated: "npm:~3.16.1"
11448
-
react-native-safe-area-context: "npm:4.12.0"
11449
-
react-native-screens: "npm:~4.1.0"
11450
-
react-native-svg: "npm:15.8.0"
11451
-
react-native-web: "npm:^0.19.13"
11452
-
react-native-webrtc: "npm:^124.0.4"
11453
-
react-native-webview: "npm:13.12.4"
11454
-
react-redux: "npm:^9.1.2"
11455
-
tamagui: "npm:^1.116.12"
11456
-
typescript: "npm:~5.3.3"
11457
-
ua-parser-js: "npm:^2.0.0-rc.1"
11458
-
uuid: "npm:^11.0.2"
11459
-
viem: "npm:^2.21.40"
11460
-
wagmi: "npm:2.12.25"
11461
-
languageName: unknown
11462
-
linkType: soft
11463
-
11464
"are-we-there-yet@npm:^3.0.0":
11465
version: 3.0.1
11466
resolution: "are-we-there-yet@npm:3.0.1"
···
25578
checksum: 10/a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242
25579
languageName: node
25580
linkType: hard
25581
25582
"strict-uri-encode@npm:^2.0.0":
25583
version: 2.0.0
···
11321
languageName: node
11322
linkType: hard
11323
11324
"are-we-there-yet@npm:^3.0.0":
11325
version: 3.0.1
11326
resolution: "are-we-there-yet@npm:3.0.1"
···
25438
checksum: 10/a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242
25439
languageName: node
25440
linkType: hard
25441
+
25442
+
"streamplace-desktop@workspace:js/desktop":
25443
+
version: 0.0.0-use.local
25444
+
resolution: "streamplace-desktop@workspace:js/desktop"
25445
+
dependencies:
25446
+
"@atproto/crypto": "npm:^0.4.3"
25447
+
"@electron-forge/cli": "npm:^7.5.0"
25448
+
"@electron-forge/maker-deb": "npm:^7.5.0"
25449
+
"@electron-forge/maker-dmg": "npm:^7.5.0"
25450
+
"@electron-forge/maker-rpm": "npm:^7.5.0"
25451
+
"@electron-forge/maker-squirrel": "npm:^7.5.0"
25452
+
"@electron-forge/maker-zip": "npm:^7.5.0"
25453
+
"@electron-forge/plugin-auto-unpack-natives": "npm:^7.5.0"
25454
+
"@electron-forge/plugin-fuses": "npm:^7.5.0"
25455
+
"@electron-forge/plugin-webpack": "npm:^7.5.0"
25456
+
"@electron-forge/publisher-s3": "npm:^7.5.0"
25457
+
"@electron/fuses": "npm:^1.8.0"
25458
+
"@reforged/maker-appimage": "https://gitpkg.vercel.app/aquareum-tv/ReForged/makers/appimage?90c4b7e8449250fe2a83fb2df0f41a3fcc1b37ca"
25459
+
"@types/source-map-support": "npm:^0.5.10"
25460
+
"@typescript-eslint/eslint-plugin": "npm:^8.13.0"
25461
+
"@typescript-eslint/parser": "npm:^8.13.0"
25462
+
"@vercel/webpack-asset-relocator-loader": "npm:1.7.3"
25463
+
css-loader: "npm:^7.1.2"
25464
+
electron: "npm:33.0.2"
25465
+
electron-squirrel-startup: "npm:^1.0.1"
25466
+
eslint: "npm:^9.14.0"
25467
+
eslint-plugin-import: "npm:^2.31.0"
25468
+
fork-ts-checker-webpack-plugin: "npm:^9.0.2"
25469
+
node-loader: "npm:^2.0.0"
25470
+
source-map-support: "npm:^0.5.21"
25471
+
style-loader: "npm:^4.0.0"
25472
+
ts-loader: "npm:^9.5.1"
25473
+
ts-node: "npm:^10.9.2"
25474
+
typescript: "npm:~5.6.3"
25475
+
update-electron-app: "npm:^3.0.0"
25476
+
viem: "npm:^2.21.44"
25477
+
languageName: unknown
25478
+
linkType: soft
25479
+
25480
+
"streamplace-monorepo@workspace:.":
25481
+
version: 0.0.0-use.local
25482
+
resolution: "streamplace-monorepo@workspace:."
25483
+
dependencies:
25484
+
"@atproto/api": "npm:^0.13.16"
25485
+
"@atproto/jwk-webcrypto": "npm:^0.1.2"
25486
+
"@atproto/oauth-client-browser": "npm:^0.3.1"
25487
+
firebase-admin: "npm:^12.7.0"
25488
+
husky: "npm:^9.1.6"
25489
+
lerna: "npm:^8.1.9"
25490
+
lint-staged: "npm:^15.2.10"
25491
+
prettier: "npm:^3.3.3"
25492
+
languageName: unknown
25493
+
linkType: soft
25494
+
25495
+
"streamplace@workspace:js/app":
25496
+
version: 0.0.0-use.local
25497
+
resolution: "streamplace@workspace:js/app"
25498
+
dependencies:
25499
+
"@aquareum/atproto-oauth-client-react-native": "npm:^0.0.1"
25500
+
"@atproto-labs/pipe": "npm:^0.1.0"
25501
+
"@atproto/crypto": "npm:^0.4.2"
25502
+
"@atproto/jwk-jose": "npm:^0.1.2"
25503
+
"@atproto/oauth-client": "npm:^0.3.1"
25504
+
"@babel/core": "npm:^7.26.0"
25505
+
"@babel/plugin-proposal-export-default-from": "npm:^7.25.9"
25506
+
"@babel/plugin-syntax-export-default-from": "npm:^7.25.9"
25507
+
"@babel/plugin-transform-flow-strip-types": "npm:^7.25.9"
25508
+
"@babel/plugin-transform-private-methods": "npm:^7.25.9"
25509
+
"@babel/plugin-transform-private-property-in-object": "npm:^7.25.9"
25510
+
"@babel/plugin-transform-runtime": "npm:^7.25.9"
25511
+
"@bacons/text-decoder": "npm:^0.0.0"
25512
+
"@config-plugins/react-native-webrtc": "npm:^10.0.0"
25513
+
"@expo/metro-config": "npm:~0.19.0"
25514
+
"@expo/metro-runtime": "npm:~4.0.0"
25515
+
"@rainbow-me/rainbowkit": "npm:2.2.0"
25516
+
"@react-native-firebase/app": "npm:^21.3.0"
25517
+
"@react-native-firebase/messaging": "npm:^21.3.0"
25518
+
"@react-navigation/bottom-tabs": "npm:^6.6.1"
25519
+
"@react-navigation/drawer": "npm:^6.7.2"
25520
+
"@react-navigation/native": "npm:^6.1.18"
25521
+
"@react-navigation/native-stack": "npm:^6.11.0"
25522
+
"@reduxjs/toolkit": "npm:^2.3.0"
25523
+
"@tamagui/babel-plugin": "npm:^1.116.12"
25524
+
"@tamagui/config": "npm:^1.116.12"
25525
+
"@tamagui/lucide-icons": "npm:^1.116.12"
25526
+
"@tamagui/metro-plugin": "npm:^1.116.12"
25527
+
"@tamagui/toast": "npm:^1.116.12"
25528
+
"@tanstack/react-query": "npm:^5.59.19"
25529
+
"@types/babel__plugin-transform-runtime": "npm:^7"
25530
+
"@types/qrcode": "npm:^1"
25531
+
"@types/react": "npm:~18.3.12"
25532
+
"@types/uuid": "npm:^10.0.0"
25533
+
"@zxing/browser": "npm:^0.1.5"
25534
+
"@zxing/library": "npm:^0.21.3"
25535
+
abortcontroller-polyfill: "npm:^1.7.6"
25536
+
babel-preset-expo: "npm:~12.0.0"
25537
+
burnt: "npm:^0.12.2"
25538
+
chrono-node: "npm:^2.7.7"
25539
+
event-target-shim: "npm:^6.0.2"
25540
+
expo: "npm:~52.0.8"
25541
+
expo-build-properties: "npm:~0.13.1"
25542
+
expo-dev-client: "npm:~5.0.3"
25543
+
expo-file-system: "npm:~18.0.4"
25544
+
expo-font: "npm:~13.0.1"
25545
+
expo-linking: "npm:~7.0.3"
25546
+
expo-notifications: "npm:~0.29.8"
25547
+
expo-splash-screen: "npm:~0.29.11"
25548
+
expo-sqlite: "npm:~15.0.3"
25549
+
expo-status-bar: "npm:~2.0.0"
25550
+
expo-system-ui: "npm:~4.0.3"
25551
+
expo-updates: "npm:~0.26.7"
25552
+
expo-video: "npm:~2.0.1"
25553
+
expo-web-browser: "npm:^14.0.1"
25554
+
hls.js: "npm:^1.5.17"
25555
+
jose: "npm:^5.9.6"
25556
+
multiformats: "npm:^13.3.1"
25557
+
qrcode: "npm:^1.5.4"
25558
+
quietjs-bundle: "npm:^0.1.3"
25559
+
react: "npm:18.3.1"
25560
+
react-dom: "npm:18.3.1"
25561
+
react-native: "npm:0.76.2"
25562
+
react-native-gesture-handler: "npm:~2.20.2"
25563
+
react-native-markdown-display: "npm:^7.0.2"
25564
+
react-native-quick-crypto: "npm:^0.7.7"
25565
+
react-native-reanimated: "npm:~3.16.1"
25566
+
react-native-safe-area-context: "npm:4.12.0"
25567
+
react-native-screens: "npm:~4.1.0"
25568
+
react-native-svg: "npm:15.8.0"
25569
+
react-native-web: "npm:^0.19.13"
25570
+
react-native-webrtc: "npm:^124.0.4"
25571
+
react-native-webview: "npm:13.12.4"
25572
+
react-redux: "npm:^9.1.2"
25573
+
tamagui: "npm:^1.116.12"
25574
+
typescript: "npm:~5.3.3"
25575
+
ua-parser-js: "npm:^2.0.0-rc.1"
25576
+
uuid: "npm:^11.0.2"
25577
+
viem: "npm:^2.21.40"
25578
+
wagmi: "npm:2.12.25"
25579
+
languageName: unknown
25580
+
linkType: soft
25581
25582
"strict-uri-encode@npm:^2.0.0":
25583
version: 2.0.0