Compare commits

..
21 Commits
Author SHA1 Message Date
trentlarson 9442ea716d clear out each new-activity bucket when user visits the details page 2026-10-21 17:59:33 -06:00
trentlarson b23cec410f fix a test spelling 2026-10-20 19:43:56 -06:00
trentlarson 6f2ce234d9 bump version & add "-beta" 2026-10-19 11:06:02 -06:00
trentlarson 1e50c1897a bump to version 1.4.10 2026-10-19 11:03:47 -06:00
trentlarson db43827513 enforce hidden-data consistency 2026-10-19 11:03:11 -06:00
trentlarson f4e34f2720 add links to all claims for the nearest neighbors 2026-10-17 19:38:57 -06:00
trentlarson 7fffdd3bff when trying to create a new claim by copying, handle when HIDDEN DIDs are involved 2026-10-17 19:13:02 -06:00
trentlarson f162a2619c fix confirmation display (and remove page that didn't add anything) 2026-10-17 18:51:40 -06:00
trentlarson 875d5679b3 update PLAN & CHANGELOG for new-activity reporting work 2026-10-17 15:56:26 -06:00
trentlarson d2cdd5785e test fixes (mostly intermittent ones) 2026-10-17 15:40:27 -06:00
trentlarson 5beace2822 heavily refactor 'new activity' buttons & page for all data from alertSearch endpoints 2026-10-16 09:28:47 -06:00
jose 11dbb115e3 Merge pull request 'Firebase build command' (#237) from firebase-build-command into master
Reviewed-on: #237
2026-10-14 14:10:13 +00:00
Jose Olarte III 4ef0a51c6a Add :nostore build scripts that disable Firebase for one Android or iOS build without changing the Firebase-on default. 2026-10-13 15:53:04 -04:00
Jose Olarte III 59f503d90a Merge branch 'master' into firebase-build-command 2026-10-13 15:41:53 -04:00
trentlarson 7133c4d574 switch some of the after & before ID checks to the new changeSeq cursors 2026-10-13 12:38:16 -06:00
trentlarson d14843622d remove the remainder of PWA functionality that wasn't being used, and fix the web "share target" 2026-10-12 22:08:25 -06:00
trentlarson 6fb4314b3a fix various build inconsistencies 2026-10-12 17:03:46 -06:00
Jose Olarte III cbbf9d7bc0 Let the iOS Firebase opt-out reach Xcode and stop the share-extension script from failing under user-script sandboxing.
FIREBASE_ENABLED=false now becomes the FIREBASE_ENABLED=NO build setting for both build and archive, and an opt-out build removes stale GoogleService-Info.plist copies from the app and the embedded extension.
2026-10-12 10:37:56 -04:00
Jose Olarte III 150c69a025 Merge branch 'master' into firebase-build-command 2026-10-12 10:21:58 -04:00
Jose Olarte III a271cd1434 Enable Firebase by default for Android and iOS builds so normal local, test, and production builds no longer depend on passing -PfirebaseEnabled.
Opt out with -PfirebaseEnabled=false or FIREBASE_ENABLED=false. A missing google-services.json or GoogleService-Info.plist now fails the build instead of silently skipping Firebase.
2026-10-12 10:20:39 -04:00
trentlarson 7bf36b0845 misc docs 2026-10-11 19:51:39 -06:00
109 changed files with 5923 additions and 13056 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
# Web (development)
npm run build:web
npm run dev
# Mobile
+2 -2
View File
@@ -13,7 +13,7 @@
- **File System**: Limited browser APIs
- **Build**: `npm run build:web` (development build)
- **Build**: `npm run dev` (development server), `npm run build:web` (production build into `dist/`)
### Mobile (Capacitor)
@@ -59,7 +59,7 @@
# Web (development)
npm run build:web
npm run dev
# Mobile
@@ -63,7 +63,7 @@ follow proper review, testing, and documentation procedures.
- **CI/CD Pipeline**: GitHub Actions, build validation scripts
- **Service Worker Assembly**: `sw_scripts/`, `sw_combine.js`, WASM copy steps
- **WASM Assembly**: WASM copy steps
## Change Authorization Requirements
+1 -1
View File
@@ -39,7 +39,7 @@
### Rollback Verification
- **Web**: `npm run build:web:dev` and `npm run build:web:prod`
- **Web**: `npm run dev` and `npm run build:web:prod`
- **Mobile**: `npm run build:android:test` and `npm run build:ios:test`
@@ -19,7 +19,7 @@
### After Build System Change
- [ ] **Web Platform**: Does `npm run build:web:dev` work?
- [ ] **Web Platform**: Does `npm run dev` work?
- [ ] **Mobile Platforms**: Do iOS/Android builds succeed?
@@ -33,9 +33,9 @@
### Web Platform
- **Development**: `npm run build:web:dev` - serve and load app
- **Development**: `npm run dev` - serve and load app
- **Production**: `npm run build:web:prod` - verify SW and WASM present
- **Production**: `npm run build:web:prod` - verify WASM present
### Mobile Platforms
@@ -98,13 +98,11 @@
verify single-instance,
icons, signing
### Service Worker / WASM
### WASM
- **Trigger**: `sw_combine.js`, WASM copy path
- **Trigger**: WASM copy path
- **Validation**: Verify combined SW exists and is injected; page loads offline;
WASM present
- **Validation**: WASM present
### Docker
+1 -1
View File
@@ -5,7 +5,7 @@ VITE_LOG_LEVEL=info
# iOS doesn't like spaces in the app title.
TIME_SAFARI_APP_TITLE="TimeSafari_Test"
VITE_APP_SERVER=https://test.timesafari.app
VITE_APP_SERVER=https://test.`
# This is the claim ID for actions in the BVC project, with the JWT ID on this environment (not
# This is the claim ID for actions in the BVC project, with the JWT ID on this environment (not production).
-2
View File
@@ -5,8 +5,6 @@ dist-electon-build
node_modules
dist
signature.bin
# generated during `npm run build`
sw_scripts-combined.js
*.pem
verified.txt
myenv
+8 -6
View File
@@ -2,16 +2,18 @@
## Android Build — Google Play Services / FOSS Compatibility
**Firebase is opt-in. Do NOT enable it accidentally.**
**Firebase is on by default for Android and iOS builds.** Do not turn it off unless the build is an exceptional FOSS/F-Droid artifact.
`android/google-services.json` is gitignored and may be present on disk for push notification development, but Firebase is only activated when you explicitly pass `-PfirebaseEnabled` to Gradle:
`android/app/google-services.json` is required when Firebase is enabled. It does not decide the switch: a missing file fails the build, and a file on disk is ignored when Firebase is explicitly disabled.
- **FOSS / APK / Aurora / Zapstore / F-Droid builds**: just `./gradlew assembleRelease` — Firebase stays off even if `google-services.json` is on disk.
- **Firebase / FCM / Play Store builds**: `./gradlew bundleRelease -PfirebaseEnabled` — explicitly opt in.
- **Default (local, test, production, Play Store)**: `./gradlew assembleRelease` or `./gradlew bundleRelease` — do not pass `-PfirebaseEnabled`.
- **Opt out (F-Droid / FOSS)**: `./gradlew assembleRelease -PfirebaseEnabled=false`, or an npm `:nostore` script such as `npm run build:android:test:nostore:run`. Those set `FIREBASE_ENABLED=false`, which forwards `-PfirebaseEnabled=false`. `:nostore` disables Firebase only; it does not remove every Play Services dependency.
This guard is in `android/app/build.gradle`. Do NOT change this conditional to activate Firebase unconditionally based on file presence alone — that was the bug that broke FOSS distribution in June 2026.
iOS builds bundle `ios/App/App/GoogleService-Info.plist` by default (`ios/App/scripts/bundle-firebase-config.sh`, run from `scripts/build-ios.sh` and as an Xcode build phase). Opt out with `FIREBASE_ENABLED=false` (the build script forwards that to both the build and archive `xcodebuild` invocations), `npm run build:ios:prod:nostore`, or the Xcode build setting `FIREBASE_ENABLED=NO`. A missing plist fails an enabled build; the file's presence does not enable Firebase on its own.
`google-services.json` is intentionally excluded from git (`android/.gitignore`). Never commit it.
The guard is in `android/app/build.gradle`. Do NOT activate Firebase from file presence alone — that was the bug that broke FOSS distribution in June 2026.
Never commit `google-services.json`.
Full details, incident history, and F-Droid notes: `doc/android-firebase-gms.md`
+87 -240
View File
@@ -9,9 +9,9 @@ This guide explains how to build TimeSafari for different platforms using the co
```bash
# 🖥️ Web Development
npm install # setup -- and pkgx.dev `dev` command before this will set environment with npm, etc
npm run build:web:serve -- --test # Start with test endorser server
npm run dev # Start development server with hot reload with local endorser server
npm run build:web:prod # Production build
npm run build:web:serve:test # Test build served from dist/ (test endorser server)
npm run build:web # Production build into dist/
# 📱 Mobile Development
npm run build:ios # iOS build (opens Xcode)
@@ -219,36 +219,41 @@ Install dependencies:
npm install
```
## Web Development
## Web Development & Deployment
### Web Development Commands
```bash
# Local development
npm run dev # Start development server with hot reload (shortcut for `build:web:dev`)
npm run dev # Start development server with hot reload (writes nothing to dist/)
# Web builds
npm run build:web # Development build (starts dev server with hot reload)
# Web builds (each one writes dist/)
npm run build:web # Production build (same as build:web:prod)
npm run build:web:test # Test environment build (optimized for testing)
npm run build:web:prod # Production build (optimized for production)
npm run build:web:serve # Build and serve locally for production testing
# Build, then serve dist/ locally
npm run build:web:serve # Production build, then serve
npm run build:web:serve:test # Test build, then serve
# Docker builds
npm run build:web:docker # Development build with Docker containerization
npm run build:web:docker # Production build with Docker containerization
npm run build:web:docker:test # Test build with Docker containerization
npm run build:web:docker:prod # Production build with Docker containerization
```
### Local Development
Start the development server using `npm run dev` (a shortcut for `npm run build:web:dev`) or `npm run build:web` (both start the development server with hot reload).
Start the development server with hot reload using `npm run dev`. Open it at `http://localhost:8080/`, not at a wildcard address such as `http://[::]:8080/` or `http://0.0.0.0:8080/`: browsers only allow the cryptography the app needs on HTTPS, `localhost`, `127.0.0.1`, or `[::1]`, so any other plain-HTTP address shows a "Cannot Start Here" page.
### Web Build for Server
1. Run the production build using `npm run build:web:prod`
1. Run the production build using `npm run build:web` (or `npm run build:web:test` for the test server)
2. The built files will be in the `dist` directory
3. To test the production build locally, use `npm run build:web:serve` (builds then serves)
`dist/` is shared with the Android, iOS, Electron, and Capacitor builds, which overwrite it with non-web output. Run the web build immediately before deploying, and confirm that the browser console reports `Loading TimeSafari for platform: web`.
**Why Use `serve`?**
- **Production Testing**: Test your optimized production build locally before deployment
- **SPA Routing Validation**: Verify deep linking and navigation work correctly (handles routes like `/discover`, `/account`)
@@ -1069,6 +1074,9 @@ npm run build:ios:prod # Production build (builds for production en
npm run build:ios:test:run # Test build with auto-run (builds then runs on simulator)
npm run build:ios:prod:run # Production build with auto-run (builds then runs on simulator)
# Firebase off (`:nostore` sets FIREBASE_ENABLED=false, forwarded to xcodebuild as FIREBASE_ENABLED=NO)
npm run build:ios:prod:nostore # Same as prod, without Firebase
# Debug and release builds
npm run build:ios:debug # Debug build (builds debug app bundle)
npm run build:ios:debug:run # Debug build with auto-run (builds then runs on simulator)
@@ -1122,15 +1130,15 @@ The script handles all the necessary steps including:
If you need to build manually or want to understand the individual steps:
#### First-time iOS Configuration
##### First-time iOS Configuration
- Generate certificates inside XCode.
- Right-click on App and under Signing & Capabilities set the Team.
- In the App Developer setup (eg. https://developer.apple.com/account), under Identifiers and/or "Certificates, Identifiers & Profiles"
#### Each Release
##### Each Release
##### 0. First time (or if dependencies change)
###### 0. First time (or if dependencies change)
- `pkgx +rubygems.org +pod /bin/zsh`
@@ -1143,15 +1151,15 @@ export GEM_HOME=$shortened_path
export GEM_PATH=$shortened_path
```
##### 1. Bump the version in package.json & CHANGELOG.md for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version here:
###### 1. Bump the version in package.json & CHANGELOG.md for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version here:
```bash
cd ios/App && xcrun agvtool new-version 75 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.4.9;/g" App.xcodeproj/project.pbxproj && cd -
cd ios/App && xcrun agvtool new-version 76 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.4.10;/g" App.xcodeproj/project.pbxproj && cd -
# Unfortunately this edits Info.plist directly.
#xcrun agvtool new-marketing-version 0.4.5
```
##### 2. Build
###### 2. Build
Here's prod. Also available: test, dev
@@ -1332,6 +1340,10 @@ npm run build:android:test:run # Test build with auto-run (builds then run
npm run build:android:prod:run # Production build with auto-run (builds then runs on emulator)
# Auto-run targets the one connected device; with none or several it prompts, or exits 9 without a terminal
# Firebase off (`:nostore` sets FIREBASE_ENABLED=false, which passes -PfirebaseEnabled=false)
npm run build:android:test:nostore:run # Same as test:run, without Firebase
npm run build:android:prod:nostore # Same as prod, without Firebase
# Debug and release builds
npm run build:android:debug # Debug build (builds debug APK)
npm run build:android:debug:run # Debug build with auto-run (builds then runs on emulator)
@@ -1434,8 +1446,8 @@ The recommended way to build for Android is using the automated build script:
##### 1. Bump the version in package.json, then update these versions & run:
```bash
perl -p -i -e 's/versionCode .*/versionCode 75/g' android/app/build.gradle
perl -p -i -e 's/versionName .*/versionName "1.4.9"/g' android/app/build.gradle
perl -p -i -e 's/versionCode .*/versionCode 76/g' android/app/build.gradle
perl -p -i -e 's/versionName .*/versionName "1.4.10"/g' android/app/build.gradle
```
##### 2. Build
@@ -1468,9 +1480,11 @@ To create a signed `aab` release:
```bash
# if you use pkgx: pkgx +openjdk.org /bin/zsh
./gradlew bundleRelease -Dlint.baselines.continue=true -PfirebaseEnabled
./gradlew bundleRelease -Dlint.baselines.continue=true
```
Firebase is on by default (`firebaseEnabled=true` in `android/gradle.properties`). Do not pass `-PfirebaseEnabled` for a normal release. F-Droid and other builds that must omit Firebase use `-PfirebaseEnabled=false`, or an npm `:nostore` script (`FIREBASE_ENABLED=false`). `:nostore` only disables Firebase. It does not remove other store-linked dependencies, such as the ML Kit barcode scanner's Play Services library, and it does not by itself make the app run on every device outside the Play Store.
... and find your `aab` file at app/build/outputs/bundle/release
To create an unsigned debugging bundle (not usable in Play Store):
@@ -1486,8 +1500,6 @@ To create an unsigned debugging bundle (not usable in Play Store):
* `build-android.sh` runs `./gradlew clean`, which deletes any earlier `aab`, so
run `bundleRelease` after the build script finishes.
* Note that F-Droid builds should omit `-PfirebaseEnabled`.
At play.google.com/console:
- Go to Production or the Closed Testing and either Create Track or Manage Track.
@@ -1603,8 +1615,7 @@ Use the commands above to check and fix code quality issues.
1. **Environment Setup**: Load platform-specific environment variables
2. **Asset Building**: Vite builds optimized web assets
3. **PWA Generation**: Service worker and manifest creation
4. **Output**: Production-ready files in `dist/` directory
3. **Output**: Production-ready files in `dist/` directory
### Electron Build Process
@@ -1856,38 +1867,21 @@ npm run build:android:assets
### Build Process Overview
TimeSafari's build system follows a multi-stage process that prepares assets,
combines scripts, and generates platform-specific outputs.
TimeSafari's build system follows a multi-stage process that prepares assets
and generates platform-specific outputs.
#### Pre-Build Preparation
##### 1. Service Worker Script Preparation
```bash
# Optional: Format third-party service worker scripts
npx prettier --write ./sw_scripts/
```
**What this does:**
- Formats cryptographic libraries (`nacl.js`, `noble-curves.js`,
`noble-hashes.js`, etc.)
- These scripts are automatically combined during the build process
- Improves readability and makes version control diffs cleaner
- **Note**: This is optional and only needed when updating third-party scripts
**2. Automatic Pre-Build Steps**
The `prebuild` script automatically runs before any build:
#### Pre-Build Script
```json
"prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js && node scripts/copy-wasm.js"
"prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node scripts/copy-wasm.js"
```
**What happens automatically:**
npm runs `prebuild` only before a script named `build`. This project defines
no `build` script, so none of the `build:*` commands trigger it.
- **ESLint**: Checks and fixes code formatting in `src/`
- **Script Combination**: `sw_combine.js` combines all `sw_scripts/*.js` files
into `sw_scripts-combined.js`
**What it does when run:**
- **ESLint**: Checks code formatting in `src/`
- **WASM Copy**: `copy-wasm.js` copies SQLite WASM files to `public/wasm/`
#### Build Process Architecture
@@ -1895,11 +1889,10 @@ The `prebuild` script automatically runs before any build:
**Web Build Process:**
```text
1. Pre-Build: ESLint + Script Combination + WASM Copy
2. Environment Setup: Load .env files, set NODE_ENV
3. Vite Build: Bundle web assets with PWA support
4. Service Worker: Inject combined scripts into PWA
5. Output: Production-ready files in dist/
1. Environment Setup: Load .env files, set NODE_ENV
2. Type Check: tsc --noEmit (test and production modes)
3. Vite Build: Bundle web assets
4. Output: Production-ready files in dist/
```
**Electron Build Process:**
@@ -1922,34 +1915,6 @@ The `prebuild` script automatically runs before any build:
5. Package Creation: APK/IPA generation
```
#### Service Worker Architecture
**Script Organization:**
- `sw_scripts/` - Individual third-party scripts
- `sw_combine.js` - Combines scripts into single file
- `sw_scripts-combined.js` - Combined service worker (317KB, 10K+ lines)
- `vite.config.utils.mts` - PWA configuration using combined script
**PWA Integration:**
```typescript
// vite.config.utils.mts
pwaConfig: {
strategies: "injectManifest",
filename: "sw_scripts-combined.js", // Uses our combined script
// ... manifest configuration
}
```
**What Gets Combined:**
- `nacl.js` - NaCl cryptographic library
- `noble-curves.js` - Elliptic curve cryptography (177KB)
- `noble-hashes.js` - Cryptographic hash functions (91KB)
- `safari-notifications.js` - Safari-specific notifications
- `additional-scripts.js` - Additional service worker functionality
#### Process Environment Configuration
**Environment Files:**
@@ -2002,10 +1967,13 @@ device)
```folders
dist/
├── index.html # Main HTML file
├── assets/ # Bundled JavaScript/CSS
├── sw.js # Service worker (injected)
├── manifest.webmanifest # PWA manifest
└── wasm/ # SQLite WASM files
├── assets/ # Bundled JavaScript, CSS, and SQLite WASM
├── img/ # Static images (copied from public/)
├── models/ # Static model files (copied from public/)
├── favicon.ico
├── manifest.webmanifest # Web app manifest, incl. share_target (copied from public/)
├── robots.txt
└── sw.js # Service worker for the Web Share Target (copied from public/)
```
**Electron Build:**
@@ -2027,17 +1995,14 @@ electron/
**Manual Steps (Developer Responsibility):**
- Database migration testing
- Service worker script formatting (optional)
- Version updates and changelog
- Environment-specific builds
**Automatic Steps (Build System):**
- Code linting and formatting
- Script combination
- Type checking (test and production builds)
- Asset optimization
- Package creation
- Service worker injection
This architecture ensures consistent builds across all platforms while providing
flexibility for platform-specific optimizations and manual quality assurance steps.
@@ -2062,31 +2027,34 @@ environment setup, Vite build, and optional Docker containerization.
```bash
# Direct script usage
./scripts/build-web.sh # Development build
./scripts/build-web.sh --dev # Development build (explicit)
./scripts/build-web.sh # Production build into dist/
./scripts/build-web.sh --prod # Production build (explicit)
./scripts/build-web.sh --test # Test environment build
./scripts/build-web.sh --prod # Production environment build
./scripts/build-web.sh --docker # Build with Docker containerization
./scripts/build-web.sh --dev # Start Vite dev server (no dist/)
./scripts/build-web.sh --docker # Production build + Docker image
./scripts/build-web.sh --docker:test # Test environment + Docker
./scripts/build-web.sh --docker:prod # Production environment + Docker
./scripts/build-web.sh --serve # Build and serve locally
./scripts/build-web.sh --serve # Production build, then serve dist/
./scripts/build-web.sh --help # Show help
./scripts/build-web.sh --verbose # Enable verbose logging
# NPM Script Equivalents
npm run build:web # Development build
npm run dev # Vite dev server
npm run build:web # Production build
npm run build:web:test # Test environment build
npm run build:web:prod # Production environment build
npm run build:web:docker # Docker build
npm run build:web:docker # Production Docker build
npm run build:web:docker:test # Test Docker build
npm run build:web:docker:prod # Production Docker build
npm run build:web:serve # Production build, then serve
npm run build:web:serve:test # Test build, then serve
```
**Build Modes**:
- **Development**: Starts Vite dev server with hot reload (default)
- **Production**: Optimized for production with full minification (default)
- **Test**: Optimized for testing with minimal minification
- **Production**: Optimized for production with full minification
- **Development**: Starts Vite dev server with hot reload (`--dev` alone); with `--serve` or `--docker`, builds `dist/` in development mode
**Script Features**:
@@ -2439,9 +2407,7 @@ export async function createBuildConfig(platform: string): Promise<UserConfig> {
const appConfig = await loadAppConfig();
const isCapacitor = platform === "capacitor";
const isElectron = platform === "electron";
const isNative = isCapacitor || isElectron;
// Set platform - PWA is always enabled for web platforms
process.env.VITE_PLATFORM = platform;
return {
@@ -2457,7 +2423,6 @@ export async function createBuildConfig(platform: string): Promise<UserConfig> {
assetsDir: 'assets',
chunkSizeWarningLimit: 1000,
rollupOptions: {
external: isNative ? ['@capacitor/app'] : [],
output: {
format: 'esm',
generatedCode: { preset: 'es2015' },
@@ -2489,12 +2454,7 @@ export async function createBuildConfig(platform: string): Promise<UserConfig> {
'@jlongster/sql.js',
'absurd-sql',
// ... additional dependencies
],
exclude: isNative ? [
'register-service-worker',
'workbox-window',
// ... native exclusions
] : []
]
}
};
}
@@ -2517,98 +2477,23 @@ export async function createBuildConfig(platform: string): Promise<UserConfig> {
**File**: `vite.config.web.mts`
**Author**: Matthew Raymer
**Description**: Vite configuration for web platform with PWA support
**Description**: Vite configuration for the web platform
**Purpose**: Configures Vite for web builds with environment-specific
optimizations and PWA features.
**Purpose**: Configures Vite for web builds by delegating to the common
configuration with the `web` platform.
**Configuration Structure**:
```typescript
export default defineConfig(async () => createBuildConfig('web'));
```
**Key Features**:
- **Environment-Specific Configuration**: Different settings for dev/test/prod
- **PWA Integration**: Progressive Web App support with service worker
- **Build Optimization**: Manual chunk splitting for better caching
- **Source Maps**: Environment-specific source map configuration
- **Caching Strategies**: Production-specific API caching
**Environment Configurations**:
**Development Mode**:
```typescript
{
build: {
minify: false,
sourcemap: true,
rollupOptions: { output: { manualChunks: undefined } }
},
define: {
__DEV__: true,
__TEST__: false,
__PROD__: false
}
}
```
**Test Mode**:
```typescript
{
build: {
minify: false,
sourcemap: true,
rollupOptions: { output: { manualChunks: undefined } }
},
define: {
__DEV__: false,
__TEST__: true,
__PROD__: false
}
}
```
**Production Mode**:
```typescript
{
build: {
minify: 'terser',
sourcemap: false,
rollupOptions: {
output: {
manualChunks: {
vendor: ['vue', 'vue-router', 'pinia'],
utils: ['luxon', 'ramda', 'zod'],
crypto: ['@ethersproject/wallet', '@ethersproject/hdnode'],
sql: ['@jlongster/sql.js', 'absurd-sql']
}
}
}
},
define: {
__DEV__: false,
__TEST__: false,
__PROD__: true
}
}
```
**PWA Configuration**:
```typescript
VitePWA({
registerType: 'autoUpdate',
manifest: appConfig.pwaConfig?.manifest,
devOptions: { enabled: true, type: 'classic' },
workbox: {
cleanupOutdatedCaches: true,
skipWaiting: true,
clientsClaim: true,
sourcemap: mode !== 'production',
maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,
runtimeCaching: mode === 'production' ? [/* API caching */] : []
}
})
```
- **Minimal Configuration**: Inherits all settings from `vite.config.common.mts`
- **Mode Selection**: `--mode test` or `--mode production` (passed by
`scripts/build-web.sh`) selects the matching `.env.*` file
- **Output**: Writes to `dist/`
### B.3 vite.config.electron.mts
@@ -2699,7 +2584,6 @@ export default defineConfig(async () => createBuildConfig('capacitor'));
- **Minimal Configuration**: Inherits all settings from common config
- **Mobile Platform**: Automatically configures for mobile-specific settings
- **PWA Disabled**: Progressive Web App features disabled for native apps
- **Native Dependencies**: Handles Capacitor-specific dependencies
### B.5 vite.config.utils.mts
@@ -2708,51 +2592,15 @@ export default defineConfig(async () => createBuildConfig('capacitor'));
**Author**: Matthew Raymer
**Description**: Utility functions for Vite configuration
**Purpose**: Provides shared configuration loading and PWA manifest generation.
**Purpose**: Provides the shared alias configuration and strict ESBuild settings.
**Key Functions**:
**loadPackageJson()**: Loads and parses package.json for app configuration
**loadAppConfig()**: Returns the alias configuration used by the common and
optimized configs
**loadAppConfig()**: Loads complete application configuration including PWA settings
**PWA Configuration**:
```typescript
interface PWAConfig {
registerType: string;
strategies: string;
srcDir: string;
filename: string;
manifest: {
name: string;
short_name: string;
theme_color: string;
background_color: string;
icons: ManifestIcon[];
share_target: ShareTarget;
};
}
```
**Manifest Icons**:
- Android Chrome 192x192 PNG
- Android Chrome 512x512 PNG
- Maskable icons for adaptive UI
**Share Target Configuration**:
```typescript
share_target: {
action: "/share-target",
method: "POST",
enctype: "multipart/form-data",
params: {
files: [{ name: "photo", accept: ["image/*"] }]
}
}
```
**getStrictESBuildConfig()**: Returns ESBuild settings that fail the build on
syntax and duplicate-declaration errors
**Alias Configuration**:
@@ -2820,8 +2668,7 @@ All scripts use consistent error handling:
**Web Platform**:
- PWA features enabled
- Service worker injection
- Requires a secure context (HTTPS, `localhost`, `127.0.0.1`, or `[::1]`)
- Browser-specific optimizations
**Electron Platform**:
+31
View File
@@ -6,6 +6,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.4.10] - 2026.10.17
### Changed
- New Activities were heavily refactored and enhanced to match alertSearch endpoints with more results, cursors, etc.
- `npm run build:web` builds production into `dist/` instead of starting the dev server.
- `npm run build:web:serve` builds production (instead of development) before serving.
- `npm run build:web:docker` builds production (instead of development) before creating the image.
- `npm run build:native` builds with the Capacitor Vite config instead of a bare `vite build`.
- The claim and profile pages show "Who Can Introduce You" as a collapsed section, loading the next-closer people only when opened.
- Messages about hidden people point to who can introduce you, instead of saying nobody can.
- "Who Can Introduce You" labels a person whom Endorser hides in its results as outside your view.
### Removed
- `npm run build:web:dev` is removed; use `npm run dev` for the dev server.
- Leftover service-worker build code (`sw_scripts/`, the unused PWA config, and the `register-service-worker` package) is removed.
### Fixed
- The daily starred-project check (Android and iOS) remembers the newest change it found, so it no longer reports the same changes again the next day.
- Sharing a photo into the installed web app (Web Share Target) works again.
- `npm run docker:up:test` and `npm run docker:up:prod` run, instead of failing on a missing `build:web:build` script.
- Affirm Delivery on an offer to a project waits for the project to load, so a quick tap no longer makes the offerer both giver and recipient.
- When the browser cannot run WebAssembly ("compiler"), the start-up error screen explains it and points to the settings that block it.
- An unregistered user no longer sees every person on a claim described as unknown to this server.
## [1.4.9] - 2026.10.11
### Fixed
- Startup DB error for new installations
### Changed
- Allow in-app notifications on production (as an advanced feature)
- Allow modification of image server URL
- Terms & conditions and privacy policy
## [1.4.6] - 2026.09.27
### Fixed
- Incorrect 'test' server URLs on production.
+3 -3
View File
@@ -21,13 +21,13 @@
# Using npm scripts (recommended):
# Production: npm run build:web:docker:prod
# Test: npm run build:web:docker:test
# Development: npm run build:web:docker
# Development: ./scripts/build-web.sh --docker --dev
#
# Manual workflow:
# 1. Build web assets: npm run build:web:build -- --mode production
# 1. Build web assets: npm run build:web:prod
# 2. Build Docker: docker build -t timesafari:latest .
#
# Note: For development, use npm run build:web directly (no Docker needed)
# Note: For development, use npm run dev directly (no Docker needed)
#
# Build Arguments:
# BUILD_MODE: development, test, or production (default: production)
+40 -40
View File
@@ -33,45 +33,6 @@ npm run build:android:test:run
Assumes ADB is installed; see [Android Build](BUILDING.md#android-build) for SDK, emulator, and `PATH` setup.
#### Building an APK for Android 6 (API 23)
App versions up to 1.4.6 support Android 6.0 (API 23); later versions require Android 7.0 (API 24) or newer. To run the app on an Android 6 device, build your own APK from the 1.4.6 release commit (`6183afc2`, "bump version to 1.4.6").
Prerequisites: git, Node.js 20 (see `.nvmrc`), Java 21, and the Android SDK with `ANDROID_HOME` set (see [Android Emulator Without Android Studio](BUILDING.md#android-emulator-without-android-studio-command-line-only) for an SDK setup that skips Android Studio). With [pkgx](https://pkgx.dev), prefix the commands with `pkgx`, e.g. `pkgx npm ci`.
1. Get the 1.4.6 source:
```bash
git clone https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa.git
cd crowd-funder-for-time-pwa
git checkout 6183afc2
```
2. Confirm the minimum SDK is 23:
```bash
grep minSdkVersion android/variables.gradle # expect: minSdkVersion = 23
```
3. Install dependencies and build a production APK:
```bash
npm ci
npm run build:android:prod -- --apk
```
`npm ci` installs the exact dependency versions locked for 1.4.6. `build:android:prod -- --apk` builds the web app with production server settings, syncs it into the Android project, and runs `./gradlew assembleDebug`. The result is signed with your local Android debug key, so it installs on any device without a release keystore.
4. Find the APK at `android/app/build/outputs/apk/debug/app-debug.apk` and install it, either with `adb install android/app/build/outputs/apk/debug/app-debug.apk` (USB debugging enabled on the phone) or by copying the file to the phone and opening it (allow "Install unknown apps" for the file manager).
Notes:
* **Back up your identity first.** A self-built APK has a different signature from the Play Store app, so Android refuses to install it over the store version. Uninstalling the store version deletes the app's local data, including your identifier keys. Back up your seed phrase (Profile page → "Backup Identifier Seed") before uninstalling, then import it into the self-built app.
* This build has Firebase disabled, so push notifications through Google's FCM service are off.
* The daily notification plugin calls `java.time`, which Android provides only from 8.0 (API 26). On Android 6, scheduling a daily reminder can crash the app; leave daily reminders off. See [doc/plugin-feedback-android-6-api23-zoneid-fix.md](doc/plugin-feedback-android-6-api23-zoneid-fix.md).
* Barcode scanning uses Google Play Services; on devices without them, scanning fails while the rest of the app works.
* A self-built APK does not auto-update.
### iOS
```bash
@@ -378,7 +339,7 @@ The application uses a platform-agnostic database layer with Vue mixins for serv
**Architecture Decision**: The project uses Vue mixins over Composition API composables for platform service access. See [Architecture Decisions](doc/architecture-decisions.md) for detailed rationale.
## 📁 Project Structure
### 📁 Project Structure
```text
timesafari/
@@ -393,6 +354,45 @@ timesafari/
└── 📄 doc/README-BUILD-GUARD.md # Guard system documentation
```
### Building an APK for Android 6 (API 23)
App versions up to 1.4.6 support Android 6.0 (API 23); later versions require Android 7.0 (API 24) or newer. To run the app on an Android 6 device, build your own APK from the 1.4.6 release commit (`6183afc2`, "bump version to 1.4.6").
Prerequisites: git, Node.js 20 (see `.nvmrc`), Java 21, and the Android SDK with `ANDROID_HOME` set (see [Android Emulator Without Android Studio](BUILDING.md#android-emulator-without-android-studio-command-line-only) for an SDK setup that skips Android Studio). With [pkgx](https://pkgx.dev), prefix the commands with `pkgx`, e.g. `pkgx npm ci`.
1. Get the 1.4.6 source:
```bash
git clone https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa.git
cd crowd-funder-for-time-pwa
git checkout 6183afc2
```
2. Confirm the minimum SDK is 23:
```bash
grep minSdkVersion android/variables.gradle # expect: minSdkVersion = 23
```
3. Install dependencies and build a production APK:
```bash
npm ci
npm run build:android:prod -- --apk
```
`npm ci` installs the exact dependency versions locked for 1.4.6. `build:android:prod -- --apk` builds the web app with production server settings, syncs it into the Android project, and runs `./gradlew assembleDebug`. The result is signed with your local Android debug key, so it installs on any device without a release keystore.
4. Find the APK at `android/app/build/outputs/apk/debug/app-debug.apk` and install it, either with `adb install android/app/build/outputs/apk/debug/app-debug.apk` (USB debugging enabled on the phone) or by copying the file to the phone and opening it (allow "Install unknown apps" for the file manager).
Notes:
* **Back up your identity first.** A self-built APK has a different signature from the Play Store app, so Android refuses to install it over the store version. Uninstalling the store version deletes the app's local data, including your identifier keys. Back up your seed phrase (Profile page → "Backup Identifier Seed") before uninstalling, then import it into the self-built app.
* This build has Firebase disabled, so push notifications through Google's FCM service are off.
* The daily notification plugin calls `java.time`, which Android provides only from 8.0 (API 26). On Android 6, scheduling a daily reminder can crash the app; leave daily reminders off. See [doc/plugin-feedback-android-6-api23-zoneid-fix.md](doc/plugin-feedback-android-6-api23-zoneid-fix.md).
* Barcode scanning uses Google Play Services; on devices without them, scanning fails while the rest of the app works.
* A self-built APK does not auto-update.
## 🤝 Contributing
1. **Follow the Build Architecture Guard** - Update BUILDING.md when modifying build files
+29 -17
View File
@@ -39,8 +39,8 @@ android {
applicationId "app.timesafari.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 75
versionName "1.4.9"
versionCode 76
versionName "1.4.10"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -133,20 +133,32 @@ dependencies {
apply from: 'capacitor.build.gradle'
// Firebase / Google Play Services are opt-in. Pass -PfirebaseEnabled to any Gradle command
// to activate Firebase (FCM push notifications). Without this flag the build works on
// F-Droid, Aurora, Zapstore, and plain APK sideloading even when google-services.json
// is present on disk (it is gitignored; see AGENTS.md for the full story).
try {
def servicesJSON = file('google-services.json')
if (servicesJSON.exists() && servicesJSON.text && project.hasProperty('firebaseEnabled')) {
apply plugin: 'com.google.gms.google-services'
logger.info("Firebase enabled: google-services plugin applied")
} else if (servicesJSON.exists() && !project.hasProperty('firebaseEnabled')) {
logger.info("google-services.json present but firebaseEnabled not set — skipping Firebase plugin (pass -PfirebaseEnabled to enable)")
} else {
logger.info("google-services.json not found — Firebase plugin not applied")
// Firebase is on for every build. Opt out only with -PfirebaseEnabled=false
// (F-Droid / other builds that must not apply the google-services plugin).
// The config file does not decide the switch: when Firebase is on, a missing
// file fails the build; when it is off, a file on disk is ignored.
def firebaseEnabledRaw = project.findProperty('firebaseEnabled')
def firebaseEnabled = true
if (firebaseEnabledRaw != null) {
def normalized = firebaseEnabledRaw.toString().trim().toLowerCase()
if (normalized == 'false' || normalized == '0' || normalized == 'no') {
firebaseEnabled = false
}
} catch(Exception e) {
logger.info("google-services plugin not applied: ${e.message}")
}
if (!firebaseEnabled) {
logger.lifecycle('Firebase disabled (-PfirebaseEnabled=false): google-services plugin not applied')
} else {
def servicesJSON = file('google-services.json')
def servicesBody = servicesJSON.isFile() ? servicesJSON.getText('UTF-8') : ''
if (!servicesBody.trim() || !servicesBody.contains('mobilesdk_app_id')) {
throw new GradleException(
'Firebase is enabled, but android/app/google-services.json is missing, empty, or has no mobilesdk_app_id.\n' +
'Download it from the Firebase console (Project settings → Your apps → Android app)\n' +
'and place it at android/app/google-services.json.\n' +
'To build without Firebase (F-Droid / FOSS), pass -PfirebaseEnabled=false.'
)
}
apply plugin: 'com.google.gms.google-services'
logger.lifecycle('Firebase enabled: google-services plugin applied')
}
@@ -311,23 +311,25 @@ public class TimeSafariNativeFetcher implements NativeNotificationContentFetcher
return prefs.getString(KEY_LAST_ACKED_JWT_ID, null);
}
/**
* Store the newest JWT ID in the response (the highest ULID), so the next fetch
* asks only for later changes. The server lists them newest first, so the last
* item is the oldest.
*/
private void updateLastAckedJwtIdFromResponse(String responseBody) {
try {
JsonObject root = JsonParser.parseString(responseBody).getAsJsonObject();
if (!root.has("data")) return;
JsonArray dataArray = root.getAsJsonArray("data");
if (dataArray == null || dataArray.size() == 0) return;
JsonObject lastItem = dataArray.get(dataArray.size() - 1).getAsJsonObject();
String jwtId = null;
if (lastItem.has("jwtId")) {
jwtId = lastItem.get("jwtId").getAsString();
} else if (lastItem.has("plan")) {
JsonObject plan = lastItem.getAsJsonObject("plan");
if (plan.has("jwtId")) {
jwtId = plan.get("jwtId").getAsString();
for (int i = 0; i < dataArray.size(); i++) {
String itemJwtId = extractJwtIdFromItem(dataArray.get(i).getAsJsonObject());
if (itemJwtId != null && !itemJwtId.isEmpty() && (jwtId == null || itemJwtId.compareTo(jwtId) > 0)) {
jwtId = itemJwtId;
}
}
if (jwtId != null && !jwtId.isEmpty()) {
if (jwtId != null) {
prefs.edit().putString(KEY_LAST_ACKED_JWT_ID, jwtId).apply();
}
} catch (Exception e) {
@@ -15,8 +15,8 @@ public class NotificationInspectorPlugin extends Plugin {
}
/**
* Whether this build carries a Firebase config, i.e. was built with
* -PfirebaseEnabled. Without it, PushNotifications.register() throws on the
* Whether this build carries a Firebase config. Normal builds do.
* -PfirebaseEnabled=false omits it. Without it, PushNotifications.register() throws on the
* Capacitor plugin thread and kills the app, so JS must check this first.
* The google-services Gradle plugin generates the google_app_id resource,
* which is what Firebase's own auto-initialization looks for.
+5
View File
@@ -22,3 +22,8 @@ org.gradle.jvmargs=-Xmx1536m --add-opens=jdk.compiler/com.sun.tools.javac.api=AL
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
android.suppressUnsupportedCompileSdk=36
# Firebase/FCM is on for every Gradle build (Android Studio, ./gradlew, npm scripts).
# Opt out with -PfirebaseEnabled=false. android/app/google-services.json does not
# toggle this; a missing file fails the build while Firebase is enabled.
firebaseEnabled=true
@@ -0,0 +1,353 @@
# Plan: New Activity Screen on alertSearch
## Goal
The New Activity screen (`/new-activity`, `src/views/NewActivityView.vue`)
shows the same total the daily push or text reported, broken down by kind of
activity. Each kind opens a page with the exact list and count for that kind.
When a page's count differs from the number the person was told, the page
says why.
## The two endpoints
alertSearch has two halves. Each returns **lists**, not counts; a count is a
list's length.
| Bucket | Server | What it holds | Needs |
|---|---|---|---|
| `claims` | endorser `/api/v2/report/alertSearch` | Claims by others with you as `toEntity` or `fromEntity` (offers, gives, every other claim type) | — |
| `personalPlanContributions` | endorser | Gives and offers to or from projects you issued or are agent of (your own claims included) | — |
| `trackedPlanUpdates` | endorser | Edits to starred projects | `planHandleIds` |
| `trackedPlanClaims` | endorser | Gives and offers to or from starred projects | `planHandleIds` |
| `plansNearby` | endorser | Projects created or edited in the search area | `location` |
| `profilesNearby` | partner `/api/partner/alertSearch` | Profiles created or edited in the search area | `location` |
| `profilesSimilar` | partner | Profiles close in meaning to your profile, best first, at most 50, not paged | a profile with text |
| `plansSimilar` | partner | Projects close in meaning to your profile, best first, at most 50, not paged | a profile with text |
Paging facts (from the endorser-ch handlers):
- Each server has one cursor covering all of its buckets. Endorser cursors
look like `1234567`; partner cursors look like `45678-1234567` (partner
position, then main position). Clients treat both as opaque text, compared
only for equality.
- `afterCursor` returns changes after it, oldest first; `beforeCursor` returns
changes before it, newest first. Both together bound a window.
- A page holds at most 50 rows per list, all cut at the same change point;
`hasMore` is one flag for the whole page.
- A row's `changeSeq` is not a cursor, so no cursor points at a single item.
## How the notification service counts
`notification-wakeup-service` runs one daily alertSearch per channel and
identity:
- `src/alertSearch/retrieve.ts` calls both endpoints with the channel's stored
`afterCursor`, `planHandleIds` and `location`, pages forward while `hasMore`
(at most 20 pages), and merges the pages.
- `src/alertSearch/digest.ts` totals all eight buckets.
- Cursors are stored per channel (`fcm` and `sms` in separate tables) and
advance after every run in which both sources complete, sent or not. Each
daily count therefore covers only changes after the previous run, whether or
not the person opened the app in between, so no item is counted in two
notifications. Rejected: subtracting the previous day's count, which would
subtract it twice.
- An upload carrying a cursor for a server replaces that server's stored
cursor, and the first run counts from it. An upload without one leaves the
stored cursor alone.
- A run with no stored cursor for a server only stores that server's cursor
and counts nothing from it. The app avoids this by sending cursors with
every upload that turns a channel on (see "Starting from the latest
change").
- The SMS body is `Gift Economies: you have N new updates.
https://giftopia.me/deep-link/new-activity?c=<start cursors> Reply STOP to
end.` The FCM payload carries title, body, `type: "alert_search"` and `c`.
## Read state
Stored as JSON in one settings column, `newActivityCursors`
(`NewActivityCursorState` in `src/libs/newActivity.ts`):
- **Visit window**, one cursor per server. The summary counts every bucket from
its start, the same window the notification service counts from once the
visit is uploaded to it, except a bucket whose list was opened after that
start was recorded: it counts from the end of that list (`summaryStart` in
`src/libs/newActivity.ts`, `countSummaryActivity` in
`src/services/newActivity.ts`).
- **Bucket window**, one per bucket, on that bucket's server. A detail page
lists everything since the end of its last load, so opening it marks the
bucket read; reopening it shows nothing new until more arrives, and "Show
earlier" lists what it showed before. A bucket never opened starts where the
summary does, so its first detail count equals the summary's.
- **Uploaded**, the cursors last sent to each notification channel.
A window records where a load counted from (`from`) and when that cursor was
recorded (`fromSeenAt`), where it ended (`to`) and when (`seenAt`), and when
the visit began (`at`). A summary load less than 30 minutes after `at` is the
same visit and counts from the same `from`, so reloading the summary keeps the
counts of unopened lists; a later load starts a new visit from the last
`to`. "Mark unread from this item" does not exist, since no cursor points at an
item.
The first load ever has no cursor. It only records where to start and shows
nothing as new:
1. The app sends each server a request with no cursor and no ID. The server
answers with its most recent rows and its latest cursors
(`nextAfterCursor`).
2. The app ignores the rows: every count is 0 and every list is empty
(`countServer` and `loadBucket` in `src/services/newActivity.ts` count
nothing without a start).
3. It stores a visit ending at those cursors (`seedIfNeeded`, `seededState`),
with a start time long past, so the next load counts from them.
Home and the detail pages seed before counting; the summary's own first load
does the same, since the end of a load with no start becomes the start of
the next visit. Turning on notifications seeds too, with the cursors it
uploads. Seeding needs both servers to answer; otherwise nothing is stored,
nothing shows as new, and the next load tries again. A detail page's "Show
earlier" still lists what came before the seed.
Arriving through a notification link with no visit yet counts from the
link's `c` instead.
Rejected: starting endorser after the oldest `lastAcked*JwtId` (`afterId`) so
items unread on the earlier screen stay unread; the app would then depend on
the ID path that endorser-ch plans to retire.
Opening a detail page also moves the `lastAcked*JwtId` read markers
(`claims` → offers to you, `personalPlanContributions` → offers to your
projects, `trackedPlanUpdates` → starred changes), which the Recent Offers
pages use to mark the last-read offer.
## Summary screen
- One alertSearch call per server from the visit start, paging forward while
`hasMore` up to 4 pages; past that a count shows "+".
- Same inputs as the notification service: `planHandleIds` from
`settings.starredPlanHandleIds`, `location` from the first
`settings.searchBoxes` entry converted from `BoundingBox` to
`minLocLat/maxLocLat/minLocLon/maxLocLon`.
- The total at the top is the sum of all eight buckets, as the service totals
them, so with no activity since the run it equals the notified number.
- With no search box, the location rows link to `/search-area`; with no
starred projects, the tracked rows show a hint.
- A server that fails shows "?" on its buckets and the error; the other
server's counts appear, and the visit does not move.
## Home screen
The Home screen shows one tile per bucket with something unseen, in the
summary's order, from the same eight alertSearch buckets
(`countUnseenActivity` in `src/services/newActivity.ts`).
- Each tile shows the count (with "+" past the page limit) and the bucket's
label, and opens that bucket's detail page with `?expected=` set to the
count. "View All New Activity For You" opens the summary.
- A bucket counts from the end of whichever load the person saw last: the
summary's visit or that bucket's own list (`unseenStart` in
`src/libs/newActivity.ts`, ordered by each window's `seenAt`). It never
uses a visit's start, so a summary just loaded shows no tiles, even inside
the 30-minute visit in which the summary keeps showing its counts.
- Buckets on one server with the same start share one request, so with no
list opened since the summary, Home makes one request per server.
- Home writes the cursor state only to seed it on the first load ever; it
never starts a visit otherwise, and never uploads to the notification
service.
- Tile test IDs are `newActivityNumber-<bucket>`.
## Detail pages
One view, `/new-activity/:bucket` (`NewActivityBucketView.vue`), calls the
same endpoint from the bucket start and shows only that bucket, so its count
is exact. A per-bucket legacy endpoint cannot match it: `/report/offers`
holds only offers, while `claims` holds every claim type that names you.
- The heading shows its own count. The summary and the Home tiles pass their
count as `?expected=`; when they differ, a note says how many came before
the tapped count started, or that the list has fewer than it showed.
Rejected: handing Home's rows to the detail page, which saves one request
while this query runs anyway after a deep link, a relaunch, a capped count
or a different bucket start.
- "Show more" continues forward; "Show earlier" pages back with
`beforeCursor` from the bucket start, listing items already seen.
- Rows (`NewActivityRow.vue`) link to `/claim/:id`, `/project/:handleId`,
`/user-profile/:rowId`; similarity matches show their match percentage.
- `trackedPlanUpdates` keeps the before/after diff (`PlanChangeDiff.vue`),
fed by `plansLastUpdatedBetween` for the page's handle IDs with `afterId`
just before the oldest edit, because alertSearch plan rows carry no earlier
claim.
- The `claims` and `personalPlanContributions` pages link to
`RecentOffersToUserView` and `RecentOffersToUserProjectsView`.
- endorser-ch returns `claim` on `claims` rows, so the page can say what was
offered or given.
## Re-registering notifications on visit
When the summary (`/new-activity`) opens a new visit and the push or text
channel is on, the app re-uploads that channel's alert authorization in the
background, after the counts are on screen: a fresh
JWT batch replacing the unused one, with the visit's end cursors, the starred
handle IDs and the search area. The next daily count then starts from this
visit and uses the person's current starred projects and area.
- It reuses `mintAlertAuthorizationBatch` and the POST
`/notifications/alert-authorization` and POST
`/notify-sms/alert-authorization` routes
(`src/services/notifications/newActivityRefresh.ts`).
- It is skipped inside the same visit, and when the channel already counts
from this visit's start and nothing is new.
- Detail pages and the Home screen never upload. A detail page's window is
narrower than the service's single cursor per server, so uploading it would
drop the other buckets' unseen items from the next notification.
- Changing the text time re-uploads without cursors, so nothing waiting for
the next text is dropped.
Notification service changes this needs:
1. `AlertAuthorizationRequestBody` accepts optional `endorserAfterCursor`,
`partnerAfterCursor`, `planHandleIds` and `location`; the routes write all
four into that channel's cursor table.
2. The daily run sends the stored `planHandleIds` and `location` to
alertSearch.
3. `replaceUnusedBatch` skips days that already hold a consumed JWT.
Without that, a re-upload after today's run installs an unused JWT for
today, and the scheduler runs and pushes a second time the same day (SMS
has a per-phone daily cap; FCM has none).
4. `profilesSimilar` and `plansSimilar` join the total on both sides:
`mergePartner` keeps them (deduplicated by profile `rowId` and plan
`handleId`) and `ALERT_SEARCH_DIGEST_BUCKETS` lists them.
5. Cursors advance only when both sources complete, so a half-failed run
repeats the whole window on its retry.
6. A run with no stored cursor for a source seeds that cursor and counts
nothing from it.
## Starting from the latest change
Turning on push or text notifications (the toggles in `AccountViewView.vue`)
sends the latest cursors with the first upload, so the first notification
counts only what happens after the person turned it on. The app gets those
cursors from one alertSearch call per server, made just before the upload,
and stores them as its visit when it has none. Each server stands alone: one
that does not answer gets the end of the last visit instead, and with neither
its cursor is left out of the upload. Service change 6 covers only that last
case.
## Notification links carry the window
Each run holds the cursors it counted from (`startCursors` on the daily
result). The text and the push carry them, so the app can tell whether it is
looking at the same window the person was told about.
- SMS URL: one parameter joining both servers' start cursors with `.`:
`https://giftopia.me/deep-link/new-activity?c=1234567.45678-1234567`.
That adds about 25 characters; the body stays inside one 160-character
segment for counts under 10,000. A first run counts nothing and sends no
text.
- FCM: the same `c` in the data payload, and a tap routes to
`/new-activity?c=…`.
- App: `deepLinkQuerySchemas["new-activity"]` accepts optional `c`. When `c`
differs from the visit start, the summary also counts from `c` and compares
totals: fewer since the visit means "you may have already seen some of what
it counted"; more means "this includes N from before that notification".
- Optional, for an exact replay: also send the run's end cursors and offer a
"Show what the notification counted" view using `afterCursor` = start and
`beforeCursor` = end. That doubles the URL addition and can push the text
past one segment.
## Steps
App (`crowd-funder-for-time-pwa`):
- [x] HTTP client and paging in `src/libs/alertSearch.ts`.
- [x] Bucket registry and cursor state in `src/libs/newActivity.ts`; loads in
`src/services/newActivity.ts`.
- [x] Settings column `newActivityCursors`, migration
`012_add_newActivityCursors_to_settings`.
- [x] `NewActivityView.vue` as the summary, with the `c` comparison.
- [x] `NewActivityBucketView.vue`, `NewActivityRow.vue`, `PlanChangeDiff.vue`,
route `/new-activity/:bucket`.
- [x] Re-upload on visit; latest cursors from the enable toggles.
- [x] `c` in the deep-link query schema; FCM taps open New Activity with `c`.
- [x] First load seeds cursors and shows nothing; no `afterId` sent.
- [x] Home tiles for all eight buckets, each opening its detail page, counted
from `unseenStart`; the legacy `/report/offers`,
`offersToPlansOwnedByMe` and starred-changes counts removed from Home.
- [x] Jest tests (`src/test/newActivity.test.ts`); Playwright specs 50 and 55
updated.
- [x] Playwright specs 50 and 55 pass against local servers in Chromium and
Firefox.
- [x] CHANGELOG entry (1.4.10).
- [x] Test and start-up fixes found while running the specs (Home records
where New Activity starts in parallel with the feed, Affirm Delivery waits
for the offer's project, a WebAssembly explanation on the start-up error
screen, test warm-up, retry and reporter).
- [ ] Release the app after endorser-ch is deployed, since detail rows read
`claim` from `alertSearch` — next: release (Trent)
Notification service (`notification-wakeup-service`):
- [x] Service changes 1–6, `c` in the SMS link and FCM data, tests, README,
CHANGELOG.
- [ ] Deploy to test and production — next: deploy, or tick this if done
(Trent)
endorser-ch:
- [x] `claim` on `claims` rows of `/api/v2/report/alertSearch`, CHANGELOG.
- [x] An Offer that names its plan in `itemOffered.isPartOf` (as the app
sends) gets `toEntity`, so it reaches the owner's
`personalPlanContributions` and `trackedPlanClaims`; migration V23 fills
existing offers without moving `changeSeq`; test, CHANGELOG.
- [ ] Commit the `isPartOf` change: `CHANGELOG.md`, `sql/README.md`,
`sql/V23__offer_is_part_of_to_entity.sqlite3`, `claim.service.js`,
`endorser.db.service.js`, `test/controller-endorser-6-plans-totals.js` —
next: commit (Trent)
- [ ] Deploy to test, then production, running Flyway on the main DB so V23
applies — next: deploy (Trent)
- [ ] Leave a person's own gives and offers out of their
`personalPlanContributions` (the query includes them when a person
contributes to their own project) — next: implement after the deploys above (agent)
- endorser-ch: add `AND j.issuer != ?`, bound to the requesting DID, to
both halves of the `UNION` in `jwtsForUserPlanContributions`
(`endorser.db.service.js`), as `jwtsWithDidAfterId` does.
- endorser-ch test in `controller-endorser-6-plans-totals.js`: user 1's own
offer to user 1's plan is absent from user 1's
`personalPlanContributions`, and user 2's offer is present.
- App spec 50 "Record an offer": record the offer as User 1
(`importUserFromAccount(page, "01")`) on a project User 0 owns, then
switch to User 0 to check the `personalPlanContributions` tile and list.
"Affirm delivery" then gets User 1 as giver and the project as recipient.
- endorser-ch CHANGELOG entry; the notification service needs no change,
since its counts come from the same query.
## Out of scope
- The native background fetcher (`TimeSafariNativeFetcher`) keeps its own
read state.
## History
Closed findings from reading the notification service before these changes
(2026-10-15):
- The schedulers called `runDailyAlertSearch(userId, now, {})`, and the upload
body had no field for `location` or `planHandleIds`, so `trackedPlanUpdates`,
`trackedPlanClaims`, `plansNearby` and `profilesNearby` were always empty: the
reported total was `claims` + `personalPlanContributions`.
- `profilesSimilar` and `plansSimilar` were dropped when partner pages merged.
- Each source's cursor advanced on its own, so when one source completed and
the other failed, the retry started past the completed source's rows and
never counted them.
- A first run counted the server's newest page, up to 50 rows per bucket of old
activity.
Closed decisions:
- 2026-10-16: the first load seeds cursors and shows nothing, replacing the
`afterId` handoff from the oldest `lastAcked*JwtId`, so the app sends
`alertSearch` only cursors and endorser-ch can retire the ID path. A person
upgrading with unread offers sees them under "Show earlier" and on the
Recent Offers pages, not as new.
- 2026-10-16: detail pages query `alertSearch` themselves and do not reuse
Home's rows; an in-memory hand-off would be a second path that every
entry other than a fresh, uncapped Home tile skips.
+167
View File
@@ -0,0 +1,167 @@
# Plan: Web Push on the Web Build
## Goal
A user of the web build (browser tab or installed web app) can turn on the
Daily Reminder and New Activity notifications and receive them, matching what
native builds deliver.
Requirements:
1. A `DIRECT_NOTIFICATION` push shows its message as sent.
2. A `DAILY_CHECK` push shows the count of new activity for the active
identity, using the same Endorser query the native fetcher uses.
3. The service worker never holds a long-lived credential: it holds only
day-scoped JWTs, the same pool native builds hand to their background
fetcher.
4. The Notifications section of the Account view works on the web build.
## Can FCM replace Web Push?
No. Firebase Cloud Messaging on the web (the `firebase/messaging` SDK) is a
layer over the browser Push API: `getToken()` requires a registered service
worker (`firebase-messaging-sw.js` by default), and that worker must display the
notification, the same as a plain Web Push worker. FCM changes only the
sending side — the push server would call the FCM HTTP v1 API instead of
sending VAPID-signed Web Push requests — and it adds a Google dependency and
Firebase config to the web build. It removes none of the work below.
## Current state
- `public/sw.js` is registered by `src/main.web.ts` on the web platform. It
handles only the Web Share Target POST; it has no `push` or
`notificationclick` handler.
- The Notifications section of the Account view renders only on native
(`v-if="isNativePlatform"`, `src/views/AccountViewView.vue:81`), and the
"Notification Push Server" setting is hidden with `v-if="false"`
(`src/views/AccountViewView.vue:719`). Web users cannot subscribe.
- `src/components/PushNotificationPermission.vue` contains the web
subscription flow:
- GET `{pushUrl}/web-push/vapid` for the VAPID key (`:242`);
- `pushManager.subscribe({ userVisibleOnly: true, ... })` (`:538`);
- POST of the subscription to the relative URL `/web-push/subscribe`
(`:583`), so the web host must proxy that path to the push server;
- `askPermission()` sends the worker the placeholder secret
`"temporary-secret"` via `SEND_LOCAL_DATA`, which nothing reads.
- The push server sends a JSON payload whose `title` is `DAILY_CHECK` (run the
new-activity check) or `DIRECT_NOTIFICATION` (show `message` as-is).
- Account data lives in SQLite through absurd-sql, which a service worker
cannot open. The worker therefore cannot decrypt the identity and sign its
own JWTs.
- Native builds solve the same problem with `mintBackgroundJwtTokenPool()`
(`src/libs/crypto/backgroundJwtPool.ts`): 100 JWTs, each valid for one UTC
day, stored at index `epochDay % 100`, handed to the background fetcher by
`configureNativeFetcherIfReady()`
(`src/services/notifications/nativeFetcherConfig.ts`). Passkey (`did:peer`)
identities cannot mint the pool and raise
`BackgroundJwtUnsupportedIdentityError`.
## Work
### 1. Service worker push handling (`public/sw.js`)
- `push`: parse the JSON payload.
- `DIRECT_NOTIFICATION`: `showNotification("Direct Message", { body: message })`.
- `DAILY_CHECK` (and any other title): take the token for today's slot from the
pool, GET `{apiServer}/api/v2/report/claims` with it, count claims newer
than the stored `lastNotifiedClaimId`, store the newest ID, and show "There
is 1 new activity" / "There are N new activities".
- `notificationclick`: close the notification, focus an open app window or open
`/`.
- Worker state (token pool, `apiServer`, `activeDid`, `lastNotifiedClaimId`)
lives in the worker's own IndexedDB database, never in the app's SQLite
database.
### 2. Hand the token pool to the worker
- On app start, identity change, and pool expiry, mint the pool with
`mintBackgroundJwtTokenPool()` and `postMessage` it to the worker together
with `apiServer` and `activeDid`. Reuse the trigger points in
`src/services/notifications/notificationAuthLifecycle.ts`
(`onNotificationAuthMayBeReady`).
- Delete the `SEND_LOCAL_DATA` / placeholder-secret path in
`PushNotificationPermission.vue`.
- Passkey identities: do not offer New Activity notifications (the Daily
Reminder needs no token).
### 3. Empty daily checks
Chrome requires every push received with `userVisibleOnly: true` to show a
notification. A `DAILY_CHECK` that finds nothing new must show one anyway, or
Chrome eventually shows its own "This site has been updated in the background"
notice. Choose one (see Open questions):
- show a quiet "No new activity" notification and close it after a short delay;
- have the push server skip pushes when there is nothing new, which requires
the server to query Endorser on the user's behalf.
### 4. Re-enable the UI on the web build
- Render the Notifications section on web when `"PushManager" in window` and a
service worker is registered, instead of only on native.
- Restore the "Notification Push Server" setting for web.
- iOS Safari delivers Web Push only to web apps added to the Home Screen
(iOS 16.4+). `public/manifest.webmanifest` is linked from `index.html` and
makes the app installable; the UI must explain the Home Screen requirement on
iOS.
### 5. Hosting
- Confirm each web host (test, production, Docker `docker/*.conf`) proxies
`/web-push/subscribe` to the push server, or change the client to POST to
`{pushUrl}/web-push/subscribe`.
- Serve `sw.js` with `Cache-Control: no-cache` so worker updates reach users
promptly.
### 6. Tests
- Playwright: register the worker, then deliver pushes with the Chrome DevTools
Protocol `ServiceWorker.deliverPushMessage` and assert on the shown
notification (`registration.getNotifications()`), for both payload types.
- Unit-test the claim-counting function, extracted so it runs outside the
worker.
## Estimate
Two to four days of work, plus push-server and nginx checks (low confidence:
the push server's current behavior and routing are not visible from this
repository).
## Open questions
- Empty daily checks: silent-notification workaround, or server-side filtering?
- Does the push server serve `/web-push/vapid` and accept
`/web-push/subscribe`, and does it send `DAILY_CHECK` daily?
- Should New Activity on web use the same Endorser query as the native fetcher
(starred-plan changes) rather than `/api/v2/report/claims`, so both platforms
report the same thing?
## Rejected
- **FCM for web:** still needs a service worker; adds a Google dependency to the
web build and a server-side switch to the FCM API. See "Can FCM replace Web
Push?".
- **Reviving the old worker scripts (`sw_scripts/safari-notifications.js`):**
they read the Dexie `TimeSafari` IndexedDB database, which no longer holds
accounts, and decrypted the identity inside the worker using a secret passed
from the page, shipping NaCl and noble crypto libraries into the worker. The
day-scoped token pool needs neither.
## History
- 2025-02-18 (`2746b8fe`): the Vite config reorganization switched the web build
to a Workbox-generated worker, so the custom push, notification-click, and
share-target handlers stopped shipping.
- 2025-07-18 (`8bc1c521`): VitePWA and the generated worker were removed; the
web manifest stopped being generated and linked.
- The leftover `sw_scripts/` files and PWA config were deleted, and
`public/sw.js` was added for the Web Share Target only.
## Checklist
- [ ] Decide the empty-daily-check behavior
- [ ] Confirm push-server endpoints and routing per environment
- [ ] `push` and `notificationclick` handlers in `public/sw.js`
- [ ] Token-pool handoff to the worker; remove the placeholder secret
- [ ] Re-enable the web Notifications UI, with the iOS Home Screen note
- [ ] Playwright push-delivery tests
+1 -3
View File
@@ -198,9 +198,7 @@ These take no parameters.
### Gift Routes
- `timesafari://confirm-gift/:id`
- Query params:
- `action`: "confirm" | "details"
- `timesafari://confirm-gift/:id` opens the claim page, the same as `timesafari://claim/:id`
### Offer Routes
+1 -3
View File
@@ -104,9 +104,7 @@ Build Scripts:
├── scripts/** # All build and automation scripts
├── electron/** # Electron build files
├── android/** # Android build configuration
├── ios/** # iOS build configuration
├── sw_scripts/** # Service worker scripts
└── sw_combine.js # Service worker combination
└── ios/** # iOS build configuration
Deployment:
├── Dockerfile # Docker configuration
+20 -21
View File
@@ -2,49 +2,47 @@
## Overview
The app is designed to work on Android devices with and without Google Play Services (GMS). Firebase/FCM push notifications are an opt-in feature at build time; all other functionality works on GMS-less devices (F-Droid, LineageOS without OpenGApps, etc.).
The app is designed to work on Android devices with and without Google Play Services (GMS). Firebase/FCM is **on by default** for local, test, and production builds. GMS-less devices still run the app; FCM degrades when Play Services is absent. F-Droid and other builds that must omit Firebase opt out explicitly.
## How the opt-in guard works
## How the switch works
`android/app/build.gradle` applies the `com.google.gms.google-services` Gradle plugin only when **both** conditions are true:
`android/app/build.gradle` applies `com.google.gms.google-services` unless `firebaseEnabled` is `false`. `android/gradle.properties` sets `firebaseEnabled=true`, so Android Studio, `./gradlew`, and `scripts/build-android.sh` all pick it up. `-PfirebaseEnabled` and `-PfirebaseEnabled=true` stay on. The config file does not decide the switch.
1. `android/google-services.json` is present on disk
2. The Gradle property `firebaseEnabled` is explicitly passed
When Firebase is on, `android/app/google-services.json` must exist, be non-empty, and contain `mobilesdk_app_id`. Otherwise configuration fails with an error that names that path. When Firebase is off, the file is ignored even if it is on disk.
```groovy
if (servicesJSON.exists() && servicesJSON.text && project.hasProperty('firebaseEnabled')) {
apply plugin: 'com.google.gms.google-services'
}
```
`scripts/build-android.sh` forwards an opt-out: `FIREBASE_ENABLED=false` adds `-PfirebaseEnabled=false` to its Gradle commands. Default npm scripts leave Firebase on. A `:nostore` script sets `FIREBASE_ENABLED=false` and reuses that script (`npm run build:android:test:nostore:run`).
This means the file can live on disk for development purposes without accidentally activating Firebase.
iOS uses the same default. `ios/App/scripts/bundle-firebase-config.sh` copies `ios/App/App/GoogleService-Info.plist` into the app and the share extension. `scripts/build-ios.sh` runs it with `--check` before a device build, and both Xcode targets run it as a build phase. The build and archive `xcodebuild` commands both receive `FIREBASE_ENABLED`. `FIREBASE_ENABLED=false` becomes `FIREBASE_ENABLED=NO` and skips the plist. A `:nostore` script sets that variable (`npm run build:ios:prod:nostore`). A missing or empty plist fails the build when Firebase is on.
`:nostore` disables Firebase only. It does not strip other store-linked dependencies (the ML Kit barcode scanner still pulls in Play Services) and does not guarantee the build will run on every device outside the Play Store.
## Build commands
| Target | Command | Firebase |
|---|---|---|
| APK / sideload / Zapstore | `./gradlew assembleRelease` | off |
| Aurora / Play Store without FCM | `./gradlew bundleRelease` | off |
| Play Store with FCM push notifications | `./gradlew bundleRelease -PfirebaseEnabled` | on |
| F-Droid | `./gradlew assembleRelease` | off (required) |
| Local / test / production APK or AAB | `./gradlew assembleRelease` or `bundleRelease` | on |
| Play Store with FCM | `./gradlew bundleRelease` | on |
| iOS (Xcode or `scripts/build-ios.sh`) | default | on |
| F-Droid / FOSS Android | `./gradlew assembleRelease -PfirebaseEnabled=false` or `npm run build:android:test:nostore` | off |
| iOS without Firebase | `FIREBASE_ENABLED=false` or `npm run build:ios:prod:nostore` | off |
## Behavior on non-GMS devices
When built with `-PfirebaseEnabled`, Firebase SDKs check for GMS availability at startup and degrade gracefully if it is absent:
When Firebase is enabled (the default), Firebase SDKs check for GMS availability at startup and degrade gracefully if it is absent:
- Firebase initializes but detects no GMS
- FCM skips token registration silently (no token, no notifications)
- The app continues to work normally
This means a single Play Store AAB (`bundleRelease -PfirebaseEnabled`) covers both GMS and non-GMS users. GMS users get push notifications; non-GMS users get a fully functional app without them.
This means a single Play Store AAB (`bundleRelease`, Firebase on by default) covers both GMS and non-GMS users. GMS users get push notifications; non-GMS users get a fully functional app without them.
**Aurora Store** pulls the exact APK from Play Store servers, so Aurora users get whichever variant was uploaded. The Play Store AAB built with `-PfirebaseEnabled` is correct for Aurora.
**Aurora Store** pulls the exact APK from Play Store servers, so Aurora users get whichever variant was uploaded. The default Play Store AAB (Firebase on) is the one to upload.
**F-Droid** is stricter: their build policy rejects any APK with GMS dependencies at the binary level, even with graceful degradation. F-Droid submission would require a separate `assembleRelease` build (no flag) and a dedicated F-Droid listing.
**F-Droid** is stricter: their build policy rejects any APK with GMS dependencies at the binary level, even with graceful degradation. F-Droid submission would require a separate `assembleRelease -PfirebaseEnabled=false` build and a dedicated F-Droid listing.
## Push registration in builds without Firebase
A build without `-PfirebaseEnabled` contains the `@capacitor/push-notifications` plugin, but no Firebase config. In that build, `PushNotifications.register()` throws `Default FirebaseApp is not initialized` on the Capacitor plugin thread, which kills the app; a JS `try/catch` cannot intercept it.
A build with `-PfirebaseEnabled=false` contains the `@capacitor/push-notifications` plugin, but no Firebase config. In that build, `PushNotifications.register()` throws `Default FirebaseApp is not initialized` on the Capacitor plugin thread, which kills the app; a JS `try/catch` cannot intercept it.
The JS therefore asks native code first. `NotificationInspector.isFirebaseConfigured()` (`android/app/src/main/java/app/timesafari/notifications/NotificationInspectorPlugin.java`) reports whether the `google_app_id` string resource exists; the google-services Gradle plugin generates that resource only when Firebase is enabled, and it is the same signal Firebase's auto-initialization uses. `firebaseMessagingClient.ts` skips `register()` on Android when it is absent (or when the check fails), logging `No Firebase config in this Android build; skipping push registration`. Listener setup and the notification permission request run either way, since local daily notifications need that permission.
@@ -56,7 +54,8 @@ Any code that calls `PushNotifications.register()` or other `FirebaseMessaging`
- Gitignored (`android/.gitignore` line 80) — never commit it
- Contains Firebase project credentials (project number, app ID, API key)
- Safe to leave on disk; has no effect unless `-PfirebaseEnabled` is passed
- Required for the default (Firebase on) build. Place it at `android/app/google-services.json`
- Ignored when you pass `-PfirebaseEnabled=false`; leaving it on disk does not re-enable Firebase
- Obtain from the Firebase console: Project Settings → Your apps → Android app → Download `google-services.json`
## Known GMS dependency: MLKit barcode scanner
+3 -3
View File
@@ -240,7 +240,7 @@ Complete this section once before your first physical-device push test. If Fireb
2. The repo gitignores this file — each developer keeps a local copy; never commit it.
3. Rebuild so Gradle applies the Google Services plugin (`android/app/build.gradle` applies `com.google.gms.google-services` when the file exists). If the file is missing, the build logs: *google-services.json not found, google-services plugin not applied. Push Notifications won't work*.
3. Rebuild. Firebase is on by default, so Gradle applies the Google Services plugin. If `android/app/google-services.json` is missing or empty, the build stops and names that path. Opt out only with `-PfirebaseEnabled=false` or `FIREBASE_ENABLED=false`.
4. Sync Capacitor if you changed native config:
@@ -928,11 +928,11 @@ Compare with panel **Backend Status** and Event Log error text.
### Gradle: Push Notifications won't work
**Symptoms:** Build log: `google-services.json not found, google-services plugin not applied`.
**Symptoms:** Build fails: `android/app/google-services.json is missing, empty, or has no mobilesdk_app_id`.
**Likely causes:** Missing `android/app/google-services.json`.
**Verification:** File exists on disk; rebuild shows Google Services plugin applied.
**Verification:** File exists on disk and the build log says `Firebase enabled: google-services plugin applied`.
**Fixes:** Download from Firebase Console (package `app.timesafari.app`); place in `android/app/`; `npx cap sync android` and rebuild.
-1
View File
@@ -212,7 +212,6 @@ export default class ComponentName extends Vue {
- [ ] ContactGiftingView.vue
- [x] DiscoverView.vue ✅ **MIGRATED & HUMAN TESTED**
- [ ] ImportAccountView.vue
- [ ] ConfirmGiftView.vue
- [ ] SeedBackupView.vue
- [ ] ContactAmountsView.vue
- [x] ContactQRScanFullView.vue ✅ **MIGRATED & HUMAN TESTED**
@@ -289,7 +289,6 @@ const { sql, params } = this.$generateInsertStatement(contact, 'contacts');
- [ ] ContactGiftingView.vue
- [ ] DiscoverView.vue
- [ ] ImportAccountView.vue
- [ ] ConfirmGiftView.vue
- [ ] SeedBackupView.vue
- [ ] [5 more view files]
-1
View File
@@ -175,7 +175,6 @@ export async function createBuildConfig(mode: string) {
return defineConfig({
define: {
'process.env.VITE_PLATFORM': JSON.stringify(mode),
// PWA is automatically enabled for web platforms via build configuration
__IS_MOBILE__: JSON.stringify(isCapacitor),
__USE_QR_READER__: JSON.stringify(!isCapacitor)
},
+4 -5
View File
@@ -5,10 +5,9 @@
# IMPORTANT: Build web assets first using npm scripts before running docker-compose
#
# Usage:
# Development: npm run build:web:build -- --mode development && docker-compose up dev
# Test: npm run build:web:build -- --mode test && docker-compose up test
# Production: npm run build:web:build -- --mode production && docker-compose up production
# Custom: BUILD_MODE=test npm run build:web:build -- --mode test && docker-compose up custom
# Test: npm run docker:up:test (runs npm run build:web:test && docker-compose up test)
# Production: npm run docker:up:prod (runs npm run build:web:prod && docker-compose up production)
# Custom: npm run build:web:test && BUILD_MODE=test docker-compose up custom
#
# Environment Variables:
# BUILD_MODE: development, test, or production (default: production)
@@ -16,7 +15,7 @@
# PORT: port to expose (default: 80 for production, 8080 for test)
# ENV_FILE: environment file to use (default: .env.production)
#
# Note: For development, use npm run build:web directly (no Docker needed)
# Note: For development, use npm run dev directly (no Docker needed)
version: '3.8'
+2 -5
View File
@@ -103,7 +103,6 @@ The Dockerfile supports these build arguments:
| `BUILD_MODE` | `production` | Build mode: development, staging, or production |
| `NODE_ENV` | `production` | Node.js environment |
| `VITE_PLATFORM` | `web` | Vite platform type |
| PWA | `enabled` | Automatically enabled for web platforms |
### Environment Variables
@@ -114,7 +113,6 @@ Docker Compose supports these environment variables:
| `BUILD_MODE` | `production` | Build mode |
| `NODE_ENV` | `production` | Node environment |
| `VITE_PLATFORM` | `web` | Vite platform |
| PWA | `enabled` | Automatically enabled for web platforms |
| `DEV_PORT` | `5173` | Development port |
| `STAGING_PORT` | `8080` | Staging port |
| `PROD_PORT` | `80` | Production port |
@@ -219,13 +217,12 @@ BUILD_MODE=staging NODE_ENV=staging ./docker/run.sh custom
docker build \
--build-arg BUILD_MODE=staging \
--build-arg NODE_ENV=staging \
-t timesafari:staging-no-pwa .
-t timesafari:staging .
# Run with custom configuration
docker run -d -p 9000:80 \
-e VITE_APP_SERVER=https://test.example.com \
timesafari:staging-no-pwa
timesafari:staging
```
### Docker Compose with Custom Variables
-6
View File
@@ -13,7 +13,6 @@
# BUILD_MODE: development, staging, or production
# NODE_ENV: node environment
# VITE_PLATFORM: vite platform
# PWA: automatically enabled for web platforms
# PORT: port to expose
# ENV_FILE: environment file to use
@@ -71,7 +70,6 @@ show_usage() {
echo " BUILD_MODE: development, staging, or production"
echo " NODE_ENV: node environment"
echo " VITE_PLATFORM: vite platform"
echo " PWA: automatically enabled for web platforms"
echo " PORT: port to expose"
echo " ENV_FILE: environment file to use"
}
@@ -86,7 +84,6 @@ show_build_args() {
echo " BUILD_MODE: development"
echo " NODE_ENV: development"
echo " VITE_PLATFORM: web"
echo " PWA: enabled (web platform)"
echo " Target: development"
echo " Port: 5173"
;;
@@ -94,7 +91,6 @@ show_build_args() {
echo " BUILD_MODE: staging"
echo " NODE_ENV: staging"
echo " VITE_PLATFORM: web"
echo " PWA: enabled (web platform)"
echo " Target: staging"
echo " Port: 80 (mapped to 8080)"
;;
@@ -102,7 +98,6 @@ show_build_args() {
echo " BUILD_MODE: production"
echo " NODE_ENV: production"
echo " VITE_PLATFORM: web"
echo " PWA: enabled (web platform)"
echo " Target: production"
echo " Port: 80"
;;
@@ -110,7 +105,6 @@ show_build_args() {
echo " BUILD_MODE: \${BUILD_MODE:-production}"
echo " NODE_ENV: \${NODE_ENV:-production}"
echo " VITE_PLATFORM: \${VITE_PLATFORM:-web}"
echo " PWA: enabled for web platforms"
echo " Target: \${BUILD_TARGET:-production}"
echo " Port: \${CUSTOM_PORT:-8080}:\${CUSTOM_INTERNAL_PORT:-80}"
;;
+1
View File
@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<link rel="manifest" href="/manifest.webmanifest" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=no, interactive-widget=overlays-content" />
<!-- CORS headers removed to allow images from any domain -->
+58 -12
View File
@@ -19,8 +19,6 @@
C86585DF2ED456DE00824752 /* TimeSafariShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = C86585D52ED456DE00824752 /* TimeSafariShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
C8C56E142EE0474B00737D0E /* SharedImageUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C56E132EE0474B00737D0E /* SharedImageUtility.swift */; };
C8C56E162EE064CB00737D0E /* SharedImagePlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8C56E152EE064CA00737D0E /* SharedImagePlugin.swift */; };
C8E73DD12FC6E5DC0057F59A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C8E73DD02FC6E5DC0057F59A /* GoogleService-Info.plist */; };
C8E73DD22FC6E5DC0057F59A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C8E73DD02FC6E5DC0057F59A /* GoogleService-Info.plist */; };
E9F1A0022EE05A8B00737D01 /* NotificationInspectorPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F1A0012EE05A8B00737D01 /* NotificationInspectorPlugin.swift */; };
/* End PBXBuildFile section */
@@ -185,6 +183,7 @@
504EC3001FED79650016851F /* Sources */,
504EC3011FED79650016851F /* Frameworks */,
504EC3021FED79650016851F /* Resources */,
F1REBA5E000000000000A001 /* Bundle Firebase Config */,
012076E8FFE4BF260A79B034 /* Fix Privacy Manifest */,
96A7EF592DF3366D00084D51 /* Fix Privacy Manifest */,
C86585E02ED456DE00824752 /* Embed Foundation Extensions */,
@@ -207,6 +206,7 @@
C86585D12ED456DE00824752 /* Sources */,
C86585D22ED456DE00824752 /* Frameworks */,
C86585D32ED456DE00824752 /* Resources */,
F1REBA5E000000000000A002 /* Bundle Firebase Config */,
);
buildRules = (
);
@@ -270,7 +270,6 @@
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
504EC30D1FED79650016851F /* Main.storyboard in Resources */,
2FAD9763203C412B000D30F8 /* config.xml in Resources */,
C8E73DD12FC6E5DC0057F59A /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -278,7 +277,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C8E73DD22FC6E5DC0057F59A /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -342,6 +340,48 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
F1REBA5E000000000000A001 /* Bundle Firebase Config */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
enableUserScriptSandboxing = 0;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Bundle Firebase Config";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PROJECT_DIR}/scripts/bundle-firebase-config.sh\"\n";
showEnvVarsInLog = 0;
};
F1REBA5E000000000000A002 /* Bundle Firebase Config */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
enableUserScriptSandboxing = 0;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Bundle Firebase Config";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PROJECT_DIR}/scripts/bundle-firebase-config.sh\"\n";
showEnvVarsInLog = 0;
};
96A7EF592DF3366D00084D51 /* Fix Privacy Manifest */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -541,10 +581,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = App/AppDebug.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 75;
CURRENT_PROJECT_VERSION = 76;
DEVELOPMENT_TEAM = GM3FS5JQPH;
ENABLE_APP_SANDBOX = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FIREBASE_ENABLED = YES;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Giftopia;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
@@ -552,7 +593,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.4.10;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -571,10 +612,11 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 75;
CURRENT_PROJECT_VERSION = 76;
DEVELOPMENT_TEAM = GM3FS5JQPH;
ENABLE_APP_SANDBOX = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FIREBASE_ENABLED = YES;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Giftopia;
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
@@ -582,7 +624,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.4.10;
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -600,8 +642,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = TimeSafariShareExtension/TimeSafariShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 75;
CURRENT_PROJECT_VERSION = 76;
DEVELOPMENT_TEAM = GM3FS5JQPH;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FIREBASE_ENABLED = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = TimeSafariShareExtension/Info.plist;
@@ -614,7 +658,7 @@
"@executable_path/../../Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.4.10;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari.TimeSafariShareExtension;
@@ -638,8 +682,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = TimeSafariShareExtension/TimeSafariShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 75;
CURRENT_PROJECT_VERSION = 76;
DEVELOPMENT_TEAM = GM3FS5JQPH;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FIREBASE_ENABLED = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = TimeSafariShareExtension/Info.plist;
@@ -652,7 +698,7 @@
"@executable_path/../../Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.4.10;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari.TimeSafariShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
+4 -8
View File
@@ -144,20 +144,16 @@ final class TimeSafariNativeFetcher: NativeNotificationContentFetcher {
return (s?.isEmpty == false) ? s : nil
}
/// Store the newest JWT ID in the response (the highest ULID), so the next fetch
/// asks only for later changes. The server lists them newest first, so the last
/// item is the oldest.
private func updateLastAckedJwtIdFromResponse(responseBody: String) {
guard let data = responseBody.data(using: .utf8),
let root = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let dataArray = root["data"] as? [[String: Any]], !dataArray.isEmpty
else { return }
let lastItem = dataArray[dataArray.count - 1]
var jwtId: String?
if let j = lastItem["jwtId"] as? String {
jwtId = j
} else if let plan = lastItem["plan"] as? [String: Any], let j = plan["jwtId"] as? String {
jwtId = j
}
if let jwtId = jwtId, !jwtId.isEmpty {
if let jwtId = dataArray.compactMap({ extractJwtIdFromItem($0) }).max() {
UserDefaults.standard.set(jwtId, forKey: prefsLastAckedKey)
}
}
+2 -2
View File
@@ -80,7 +80,7 @@ PODS:
- SQLCipher/common (4.10.0)
- SQLCipher/standard (4.10.0):
- SQLCipher/common
- TimesafariDailyNotificationPlugin (4.0.1):
- TimesafariDailyNotificationPlugin (5.0.0):
- Capacitor
- ZIPFoundation (0.9.20)
@@ -174,7 +174,7 @@ SPEC CHECKSUMS:
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
SQLCipher: eb79c64049cb002b4e9fcb30edb7979bf4706dfc
TimesafariDailyNotificationPlugin: 69277c884380a9a620f671b68e0327eaa4b3d27d
TimesafariDailyNotificationPlugin: b60e726f8776b5d22e026caef906f1c3b0e963dd
ZIPFoundation: dfd3d681c4053ff7e2f7350bc4e53b5dba3f5351
PODFILE CHECKSUM: 5736811d271d5309d3e2de8f3eefdbb6632086a3
+80
View File
@@ -0,0 +1,80 @@
#!/bin/sh
# Bundle GoogleService-Info.plist when Firebase is enabled (the default).
# Opt out with FIREBASE_ENABLED=false, or the Xcode build setting
# FIREBASE_ENABLED=NO. The plist does not decide the switch: a missing file
# fails an enabled build, and an opt-out build does not bundle the plist
# even when the file is on disk.
#
# Xcode run-script phases invoke this with no arguments. build-ios.sh may pass
# --check to validate before a long build without copying into a product.
set -eu
check_only=0
if [ "${1:-}" = "--check" ]; then
check_only=1
fi
if [ -z "${SRCROOT:-}" ]; then
script_dir=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
SRCROOT=$(CDPATH= cd -- "$script_dir/.." && pwd)
fi
normalized=$(printf '%s' "${FIREBASE_ENABLED:-true}" | tr '[:upper:]' '[:lower:]')
plist="${SRCROOT}/App/GoogleService-Info.plist"
firebase_off=0
case "$normalized" in
false|0|no) firebase_off=1 ;;
esac
remove_bundled_plist() {
base="$1"
leaf="$2"
if [ -n "$base" ] && [ -n "$leaf" ]; then
rm -f "${base}/${leaf}/GoogleService-Info.plist"
fi
}
if [ "$firebase_off" -eq 1 ]; then
if [ "$check_only" -eq 0 ]; then
# Drop the plist from this product, including a copy left by an earlier
# Firebase-enabled build. The app and the share extension each run this phase.
remove_bundled_plist "${TARGET_BUILD_DIR:-}" "${UNLOCALIZED_RESOURCES_FOLDER_PATH:-}"
remove_bundled_plist "${TARGET_BUILD_DIR:-}" "${WRAPPER_NAME:-}"
remove_bundled_plist "${BUILT_PRODUCTS_DIR:-}" "${WRAPPER_NAME:-}"
# Embed does not delete files that disappeared from the appex, so a plist
# copied into PlugIns on an earlier Firebase-enabled build would otherwise stay.
if [ -n "${TARGET_BUILD_DIR:-}" ] && [ -n "${WRAPPER_NAME:-}" ]; then
for stale in "${TARGET_BUILD_DIR}/${WRAPPER_NAME}/PlugIns/"*.appex/GoogleService-Info.plist; do
if [ -f "$stale" ]; then
rm -f "$stale"
fi
done
fi
fi
echo "note: Firebase disabled (FIREBASE_ENABLED=${FIREBASE_ENABLED}); GoogleService-Info.plist will not be bundled."
exit 0
fi
if [ ! -s "$plist" ] || ! grep -q "GOOGLE_APP_ID" "$plist"; then
echo "error: Firebase is enabled, but ios/App/App/GoogleService-Info.plist is missing, empty, or has no GOOGLE_APP_ID." >&2
echo "error: Download it from the Firebase console (Project settings → Your apps → Apple apps)" >&2
echo "error: and place it at ios/App/App/GoogleService-Info.plist." >&2
echo "error: To build without Firebase, set FIREBASE_ENABLED=false or pass the Xcode build setting FIREBASE_ENABLED=NO." >&2
exit 1
fi
if [ "$check_only" -eq 1 ]; then
echo "note: Firebase enabled; ios/App/App/GoogleService-Info.plist is present."
exit 0
fi
if [ -z "${TARGET_BUILD_DIR:-}" ] || [ -z "${UNLOCALIZED_RESOURCES_FOLDER_PATH:-}" ]; then
echo "error: Bundle Firebase Config must run as an Xcode build phase (TARGET_BUILD_DIR is unset)." >&2
exit 1
fi
dest_dir="${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
mkdir -p "$dest_dir"
cp "$plist" "${dest_dir}/GoogleService-Info.plist"
echo "note: Firebase enabled; bundled GoogleService-Info.plist."
+2 -7
View File
@@ -1,12 +1,12 @@
{
"name": "giftopia",
"version": "1.4.9",
"version": "1.4.10",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "giftopia",
"version": "1.4.9",
"version": "1.4.10",
"dependencies": {
"@capacitor-community/electron": "^5.0.1",
"@capacitor-community/sqlite": "^7.0.3",
@@ -87,7 +87,6 @@
"ramda": "^0.29.1",
"readable-stream": "^4.5.2",
"reflect-metadata": "^0.1.14",
"register-service-worker": "^1.7.2",
"simple-vue-camera": "^1.1.3",
"sqlite3": "^5.1.7",
"stream-browserify": "^3.0.0",
@@ -26317,10 +26316,6 @@
"node": ">=4"
}
},
"node_modules/register-service-worker": {
"version": "1.7.2",
"license": "MIT"
},
"node_modules/registry-auth-token": {
"version": "3.3.2",
"dev": true,
+16 -8
View File
@@ -1,6 +1,6 @@
{
"name": "giftopia",
"version": "1.4.9",
"version": "1.4.11-beta",
"description": "Giftopia App",
"author": {
"name": "Gift Economies Team"
@@ -26,8 +26,11 @@
"build:android:deploy": "./scripts/build-android.sh --deploy",
"build:android:dev": "./scripts/build-android.sh --dev",
"build:android:dev:custom": "./scripts/build-android.sh --dev --api-ip",
"build:android:dev:nostore": "FIREBASE_ENABLED=false npm run build:android:dev",
"build:android:dev:run:custom": "./scripts/build-android.sh --dev --api-ip --auto-run",
"build:android:prod": "./scripts/build-android.sh --prod",
"build:android:prod:nostore": "FIREBASE_ENABLED=false npm run build:android:prod",
"build:android:prod:nostore:run": "FIREBASE_ENABLED=false npm run build:android:prod:run",
"build:android:prod:run": "./scripts/build-android.sh --prod --auto-run",
"build:android:release": "./scripts/build-android.sh --release",
"build:android:release:run": "./scripts/build-android.sh --release --auto-run",
@@ -35,6 +38,8 @@
"build:android:sync": "./scripts/build-android.sh --sync",
"build:android:test": "./scripts/build-android.sh --test",
"build:android:test:custom": "./scripts/build-android.sh --test --api-ip",
"build:android:test:nostore": "FIREBASE_ENABLED=false npm run build:android:test",
"build:android:test:nostore:run": "FIREBASE_ENABLED=false npm run build:android:test:run",
"build:android:test:run": "./scripts/build-android.sh --test --auto-run",
"build:android:test:run:custom": "./scripts/build-android.sh --test --api-ip --auto-run",
"build:capacitor": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --mode capacitor --config vite.config.capacitor.mts",
@@ -78,9 +83,12 @@
"build:ios:deploy": "./scripts/build-ios.sh --deploy",
"build:ios:dev": "./scripts/build-ios.sh --dev",
"build:ios:dev:custom": "./scripts/build-ios.sh --dev --api-ip",
"build:ios:dev:nostore": "FIREBASE_ENABLED=false npm run build:ios:dev",
"build:ios:dev:run:custom": "./scripts/build-ios.sh --dev --api-ip --auto-run",
"build:ios:ipa": "./scripts/build-ios.sh --ipa",
"build:ios:prod": "./scripts/build-ios.sh --prod",
"build:ios:prod:nostore": "FIREBASE_ENABLED=false npm run build:ios:prod",
"build:ios:prod:nostore:run": "FIREBASE_ENABLED=false npm run build:ios:prod:run",
"build:ios:prod:run": "./scripts/build-ios.sh --prod --auto-run",
"build:ios:release": "./scripts/build-ios.sh --release",
"build:ios:release:run": "./scripts/build-ios.sh --release --auto-run",
@@ -88,11 +96,12 @@
"build:ios:sync": "./scripts/build-ios.sh --sync",
"build:ios:test": "./scripts/build-ios.sh --test",
"build:ios:test:custom": "./scripts/build-ios.sh --test --api-ip",
"build:ios:test:nostore": "FIREBASE_ENABLED=false npm run build:ios:test",
"build:ios:test:nostore:run": "FIREBASE_ENABLED=false npm run build:ios:test:run",
"build:ios:test:run": "./scripts/build-ios.sh --test --auto-run",
"build:ios:test:run:custom": "./scripts/build-ios.sh --test --api-ip --auto-run",
"build:native": "vite build && npx cap sync && node scripts/restore-local-plugins.js && bash -c 'source scripts/common.sh && ensure_ios_capacitor_asset_directories' && npx capacitor-assets generate --assetPath resources",
"build:native": "npm run build:capacitor:sync && bash -c 'source scripts/common.sh && ensure_ios_capacitor_asset_directories' && npx capacitor-assets generate --ios --android --assetPath resources",
"build:web": "./scripts/build-web.sh",
"build:web:dev": "./scripts/build-web.sh --dev",
"build:web:docker": "./scripts/build-web.sh --docker",
"build:web:docker:prod": "./scripts/build-web.sh --docker:prod",
"build:web:docker:test": "./scripts/build-web.sh --docker:test",
@@ -110,12 +119,12 @@
"clean:electron": "./scripts/build-electron.sh --clean",
"clean:ios": "rm -rf ios/App/build ios/App/Pods ios/App/output ios/App/App/public ios/DerivedData ios/capacitor-cordova-ios-plugins ios/App/App/capacitor.config.json ios/App/App/config.xml || true",
"deps:update-daily-notification-plugin": "npm install @timesafari/daily-notification-plugin@git+https://gitea.anomalistdesign.com/trent_larson/daily-notification-plugin.git#master",
"dev": "npm run build:web:dev",
"dev": "./scripts/build-web.sh --dev",
"docker:down": "docker-compose down",
"docker:logs": "docker-compose logs -f",
"docker:up": "docker-compose up",
"docker:up:prod": "npm run build:web:build -- --mode production && docker-compose up production",
"docker:up:test": "npm run build:web:build -- --mode test && docker-compose up test",
"docker:up:prod": "npm run build:web:prod && docker-compose up production",
"docker:up:test": "npm run build:web:test && docker-compose up test",
"guard": "bash ./scripts/build-arch-guard.sh",
"guard:setup": "npm run prepare && echo 'Build Architecture Guard is now active!'",
"guard:test": "bash ./scripts/build-arch-guard.sh --staged",
@@ -124,7 +133,7 @@
"markdown:check": "markdownlint-cli2",
"markdown:fix": "markdownlint-cli2 --fix",
"markdown:setup": "./scripts/setup-markdown-hooks.sh",
"prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js && node scripts/copy-wasm.js",
"prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node scripts/copy-wasm.js",
"prepare": "husky",
"test:all": "npm run lint && npm run type-check && npm run type-check:vue && npm run test:unit && npm run test:web && npm run test:mobile && echo '\n\n\nGotta add the performance tests'",
"test:android": "node scripts/test-android.js",
@@ -220,7 +229,6 @@
"ramda": "^0.29.1",
"readable-stream": "^4.5.2",
"reflect-metadata": "^0.1.14",
"register-service-worker": "^1.7.2",
"simple-vue-camera": "^1.1.3",
"sqlite3": "^5.1.7",
"stream-browserify": "^3.0.0",
+10 -3
View File
@@ -18,13 +18,20 @@ export default defineConfig({
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Load the app once before the tests so the dev server is warm; see that file
* for the Firefox WebAssembly failure it reduces. */
globalSetup: "./test-playwright/warmUpDevServer.ts",
/* Retry once locally: with several instances in parallel, Firefox can fail to
* start its WebAssembly compiler (so the app cannot open its database), at
* any point in a run. A retried pass is reported as "flaky", not hidden. */
retries: process.env.CI ? 2 : 1,
/* Opt out of parallel tests on CI. */
workers: 3,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: [
['list'],
// explains failures caused by the Firefox WebAssembly start-up error
['./test-playwright/webAssemblyHintReporter.ts'],
['html'],
// ['html', { open: 'never' }], // don't automatically open report page after tests complete even with failures
['json', { outputFile: 'test-playwright-results/test-results.json' }]
@@ -106,7 +113,7 @@ export default defineConfig({
*/
webServer: {
command:
"VITE_APP_SERVER=http://localhost:8080 VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 VITE_DEFAULT_PARTNER_API_SERVER=http://localhost:3000 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build:web -- --port=8080",
"VITE_APP_SERVER=http://localhost:8080 VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 VITE_DEFAULT_PARTNER_API_SERVER=http://localhost:3000 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=true npm run dev",
url: "http://localhost:8080",
reuseExistingServer: !process.env.CI,
},
+37 -37
View File
@@ -1,46 +1,46 @@
{
"name": "Giftopia",
"short_name": "Giftopia",
"start_url": "/",
"scope": "/",
"display": "standalone",
"theme_color": "#4a90e2",
"background_color": "#ffffff",
"icons": [
{
"src": "../icons/icon-48.webp",
"type": "image/png",
"sizes": "48x48",
"purpose": "any maskable"
},
{
"src": "../icons/icon-72.webp",
"type": "image/png",
"sizes": "72x72",
"purpose": "any maskable"
},
{
"src": "../icons/icon-96.webp",
"type": "image/png",
"sizes": "96x96",
"purpose": "any maskable"
},
{
"src": "../icons/icon-128.webp",
"type": "image/png",
"sizes": "128x128",
"purpose": "any maskable"
},
{
"src": "../icons/icon-192.webp",
"type": "image/png",
"src": "/img/icons/android-chrome-192x192.png",
"sizes": "192x192",
"purpose": "any maskable"
"type": "image/png"
},
{
"src": "../icons/icon-256.webp",
"type": "image/png",
"sizes": "256x256",
"purpose": "any maskable"
},
{
"src": "../icons/icon-512.webp",
"type": "image/png",
"src": "/img/icons/android-chrome-512x512.png",
"sizes": "512x512",
"purpose": "any maskable"
"type": "image/png"
},
{
"src": "/img/icons/android-chrome-maskable-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable"
},
{
"src": "/img/icons/android-chrome-maskable-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"
}
]
],
"share_target": {
"action": "/share-target",
"method": "POST",
"enctype": "multipart/form-data",
"params": {
"files": [
{
"name": "photo",
"accept": ["image/*"]
}
]
}
}
}
+68
View File
@@ -0,0 +1,68 @@
/* eslint-env serviceworker */
/**
* Service worker for the web build.
*
* Its only job is the Web Share Target: the manifest's share_target POSTs a
* photo to /share-target, which no static server can accept. This worker
* stashes the photo in Cache Storage and redirects to /shared-photo, where
* src/libs/webShareTarget.ts picks it up. Every other request goes straight to
* the network (no fetch handler response, no precaching).
*
* It also replaces the Workbox worker that older builds registered at this
* same URL, and deletes that worker's precaches, which otherwise keep serving
* a stale index.html that points at JavaScript files no longer deployed.
*/
const SHARE_TARGET_CACHE = "share-target";
// Keep in sync with src/libs/webShareTarget.ts
const SHARED_PHOTO_KEY = "/share-target/photo";
const FILE_NAME_HEADER = "X-File-Name";
self.addEventListener("install", () => {
self.skipWaiting();
});
self.addEventListener("activate", (event) => {
event.waitUntil(
(async () => {
const names = await caches.keys();
await Promise.all(
names
.filter((name) => name !== SHARE_TARGET_CACHE)
.map((name) => caches.delete(name)),
);
await self.clients.claim();
})(),
);
});
self.addEventListener("fetch", (event) => {
const url = new URL(event.request.url);
if (
event.request.method !== "POST" ||
url.origin !== self.location.origin ||
url.pathname !== "/share-target"
) {
return;
}
event.respondWith(
(async () => {
const formData = await event.request.formData();
const photo = formData.get("photo");
if (photo instanceof File) {
const cache = await caches.open(SHARE_TARGET_CACHE);
await cache.put(
SHARED_PHOTO_KEY,
new Response(photo, {
headers: {
"Content-Type": photo.type || "application/octet-stream",
[FILE_NAME_HEADER]: encodeURIComponent(photo.name || ""),
},
}),
);
}
return Response.redirect("/shared-photo?source=share-target", 303);
})(),
);
});
+1 -1
View File
@@ -15,7 +15,7 @@
## Commands Run (paste exact logs/snips)
- [ ] Web: `npm run build:web` / `:prod`
- [ ] Web: `npm run dev` / `npm run build:web`
- [ ] Electron: `npm run build:electron:dev` / package step
- [ ] Mobile: `npm run build:android:test` / iOS equivalent
- [ ] Clean/auto-run impacted scripts
+4 -6
View File
@@ -23,10 +23,10 @@ All scripts automatically handle environment variables for different build types
#### Build Types and Environment Variables
| Platform | Mode | PWA Enabled | Native Features | Build Script |
|----------|------|-------------|-----------------|--------------|
| `web` | web | true | false | `build-web.sh` |
| `capacitor` | capacitor | false | true | `build-capacitor.sh` |
| Platform | Mode | Native Features | Build Script |
|----------|------|-----------------|--------------|
| `web` | web | false | `build-web.sh` |
| `capacitor` | capacitor | true | `build-capacitor.sh` |
#### Automatic Environment Setup
@@ -183,8 +183,6 @@ All scripts automatically configure the correct environment variables for their
```bash
# Capacitor builds automatically get:
export VITE_PLATFORM=capacitor
export VITE_PWA_ENABLED=false
export VITE_DISABLE_PWA=true
export DEBUG_MIGRATIONS=0
export VITE_GIT_HASH=<git-hash>
+23 -8
View File
@@ -23,6 +23,7 @@
# --assets Generate assets only
# --deploy Deploy APK to connected device
# --uninstall Uninstall app from connected device
# FIREBASE_ENABLED=false Opt out of Firebase (-PfirebaseEnabled=false)
# -h, --help Show this help message
# -v, --verbose Enable verbose logging
#
@@ -439,6 +440,9 @@ print_android_usage() {
echo " --uninstall Uninstall app from connected device"
echo " --api-ip <ip> Custom IP address for claim API (defaults to 10.0.2.2)"
echo ""
echo "Firebase is on by default. Opt out with FIREBASE_ENABLED=false"
echo "(passes -PfirebaseEnabled=false to Gradle)."
echo ""
echo "Common Options:"
echo " -h, --help Show this help message"
echo " -v, --verbose Enable verbose logging"
@@ -460,6 +464,17 @@ print_android_usage() {
# Parse command line arguments
parse_android_args "$@"
# Firebase is on unless FIREBASE_ENABLED is false, 0, or no. Gradle also
# defaults firebaseEnabled=true; this only forwards an explicit opt-out.
gradle_firebase_arg=""
firebase_enabled_normalized=$(printf '%s' "${FIREBASE_ENABLED:-true}" | tr '[:upper:]' '[:lower:]')
case "$firebase_enabled_normalized" in
false|0|no)
gradle_firebase_arg="-PfirebaseEnabled=false"
log_info "Firebase disabled for this Android build (FIREBASE_ENABLED=${FIREBASE_ENABLED})"
;;
esac
# Print build header
print_header "TimeSafari Android Build Process"
@@ -528,7 +543,7 @@ if [ "$CLEAN_ONLY" = true ]; then
log_info "Clean-only mode: cleaning build artifacts"
safe_execute "Cleaning Android app" "npm run clean:android" || exit 1
safe_execute "Cleaning dist directory" "clean_build_artifacts dist" || exit 1
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean ${gradle_firebase_arg} && cd .." || exit 4
log_success "Clean completed successfully!"
exit 0
fi
@@ -561,7 +576,7 @@ if [ "$DEPLOY_APP" = true ]; then
fi
# Build APK
safe_execute "Building APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
safe_execute "Building APK" "cd android && ./gradlew assembleDebug ${gradle_firebase_arg} && cd .." || exit 5
# Install APK on device
safe_execute "Installing APK on device" "adb install -r android/app/build/outputs/apk/debug/app-debug.apk" || exit 6
@@ -628,26 +643,26 @@ fi
safe_execute "Generating assets" "npx capacitor-assets generate --android --assetPath resources" || exit 7
# Step 8: Clean Gradle build
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean ${gradle_firebase_arg} && cd .." || exit 4
# Step 9: Build based on type
if [ "$BUILD_TYPE" = "debug" ]; then
safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug ${gradle_firebase_arg} && cd .." || exit 5
elif [ "$BUILD_TYPE" = "release" ]; then
safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease ${gradle_firebase_arg} && cd .." || exit 5
fi
# Step 10: Build APK/AAB if requested
if [ "$BUILD_APK" = true ]; then
if [ "$BUILD_TYPE" = "debug" ]; then
safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug ${gradle_firebase_arg} && cd .." || exit 5
else
safe_execute "Building release APK" "cd android && ./gradlew assembleRelease && cd .." || exit 5
safe_execute "Building release APK" "cd android && ./gradlew assembleRelease ${gradle_firebase_arg} && cd .." || exit 5
fi
fi
if [ "$BUILD_AAB" = true ]; then
safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
safe_execute "Building AAB" "cd android && ./gradlew bundleRelease ${gradle_firebase_arg} && cd .." || exit 5
if [ "$BUILD_MODE" = "production" ]; then
safe_execute "Checking production AAB" "./scripts/check-prod-bundle.sh android/app/build/outputs/bundle/release/app-release.aab" || exit 10
fi
-2
View File
@@ -23,8 +23,6 @@ SENSITIVE=(
"electron/**"
"android/**"
"ios/**"
"sw_scripts/**"
"sw_combine.js"
"Dockerfile"
"docker/**"
"capacitor.config.ts"
+23
View File
@@ -44,6 +44,9 @@ print_ios_usage() {
echo " --auto-run Auto-run app after build"
echo " --api-ip <ip> Custom IP address for claim API (uses Capacitor default)"
echo ""
echo "Firebase is on by default. Opt out with FIREBASE_ENABLED=false"
echo "(forwarded to xcodebuild as FIREBASE_ENABLED=NO)."
echo ""
echo "Common Options:"
echo " -h, --help Show this help message"
echo " -v, --verbose Enable verbose logging"
@@ -321,6 +324,17 @@ clean_ios_build() {
log_success "iOS build cleaned"
}
# Map FIREBASE_ENABLED onto the Xcode build setting the run-script phases read.
# Unset stays YES. false, 0, and no (any case) become NO.
ios_firebase_build_setting() {
local normalized
normalized=$(printf '%s' "${FIREBASE_ENABLED:-YES}" | tr '[:upper:]' '[:lower:]')
case "$normalized" in
false|0|no) printf 'NO' ;;
*) printf 'YES' ;;
esac
}
# Function to build iOS app
build_ios_app() {
local build_config=""
@@ -358,6 +372,7 @@ build_ios_app() {
-configuration "$build_config" \
-destination "$destination" \
build \
"FIREBASE_ENABLED=$(ios_firebase_build_setting)" \
CODE_SIGN_IDENTITY="" \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGNING_ALLOWED=NO \
@@ -537,6 +552,13 @@ if [ "$ASSETS_ONLY" = true ]; then
exit 0
fi
# Firebase is on unless FIREBASE_ENABLED=false. Fail before the web build and
# xcodebuild when the plist is missing. Xcode runs the same script as a build
# phase so GUI builds get the same check and bundle the plist.
if ! ios/App/scripts/bundle-firebase-config.sh --check; then
exit 1
fi
# Handle deploy-app mode
if [ "$DEPLOY_APP" = true ]; then
deploy_ios_app
@@ -701,6 +723,7 @@ if [ "$BUILD_IPA" = true ]; then
-configuration Release \
-archivePath build/App.xcarchive \
archive \
"FIREBASE_ENABLED=$(ios_firebase_build_setting)" \
CODE_SIGN_IDENTITY="" \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGNING_ALLOWED=NO \
+23 -16
View File
@@ -5,25 +5,31 @@
# This script handles the complete web build process including cleanup,
# environment setup, Vite build, and optional Docker containerization.
#
# Every invocation except --dev writes dist/. --dev alone starts the Vite dev
# server and writes nothing.
#
# Usage:
# ./scripts/build-web.sh # Development build
# ./scripts/build-web.sh --dev # Development build (explicit)
# ./scripts/build-web.sh # Production build into dist/
# ./scripts/build-web.sh --prod # Production build (explicit)
# ./scripts/build-web.sh --test # Test environment build
# ./scripts/build-web.sh --prod # Production environment build
# ./scripts/build-web.sh --docker # Build with Docker containerization
# ./scripts/build-web.sh --dev # Start Vite dev server (no dist/)
# ./scripts/build-web.sh --docker # Production build + Docker image
# ./scripts/build-web.sh --docker:test # Test environment + Docker
# ./scripts/build-web.sh --docker:prod # Production environment + Docker
# ./scripts/build-web.sh --serve # Build and serve locally
# ./scripts/build-web.sh --serve # Production build, then serve dist/
# ./scripts/build-web.sh --help # Show help
# ./scripts/build-web.sh --verbose # Enable verbose logging
#
# NPM Script Equivalents:
# npm run build:web # Development build
# npm run dev # Vite dev server
# npm run build:web # Production build
# npm run build:web:test # Test environment build
# npm run build:web:prod # Production environment build
# npm run build:web:docker # Docker build
# npm run build:web:docker # Production Docker build
# npm run build:web:docker:test # Test Docker build
# npm run build:web:docker:prod # Production Docker build
# npm run build:web:serve # Production build, then serve
# npm run build:web:serve:test # Test build, then serve
#
# Exit Codes:
# 1 - Web cleanup failed
@@ -40,7 +46,7 @@ set -e
source "$(dirname "$0")/common.sh"
# Default values
BUILD_MODE="development"
BUILD_MODE="production"
BUILD_ACTION="build"
DOCKER_BUILD=false
SERVE_BUILD=false
@@ -51,9 +57,10 @@ show_usage() {
Usage: $0 [OPTIONS]
OPTIONS:
--dev, --development Build for development environment (default)
--prod, --production Build for production environment (default)
--test Build for test environment
--prod, --production Build for production environment
--dev, --development Start the Vite dev server (with --serve or
--docker: build for development instead)
--docker Build and create Docker container
--docker:test Build for test environment and create Docker container
--docker:prod Build for production environment and create Docker container
@@ -63,18 +70,18 @@ OPTIONS:
--env Show environment variables
EXAMPLES:
$0 # Development build
$0 # Production build
$0 --test # Test environment build
$0 --prod # Production environment build
$0 --docker # Development + Docker
$0 --dev # Development server
$0 --docker # Production + Docker
$0 --docker:test # Test + Docker
$0 --docker:prod # Production + Docker
$0 --serve # Build and serve
$0 --serve # Production build, then serve
BUILD MODES:
development: Starts Vite development server with hot reload (default)
production: Optimized for production with full minification and optimization (default)
test: Optimized for testing with minimal minification
production: Optimized for production with full minification and optimization
development: Starts Vite development server with hot reload
EOF
}
+1 -1
View File
@@ -161,4 +161,4 @@ echo "✅ Database clearing instructions completed!"
echo ""
echo "💡 Tip: After clearing the database, restart your development server:"
echo " npm run build:electron:dev # For Electron"
echo " npm run build:web:dev # For Web"
echo " npm run dev # For Web"
-1
View File
@@ -283,7 +283,6 @@ const runDeeplinkTests = async (log) => {
const buildWebAssets = async (log) => {
log('🌐 Building web assets...');
execSync('rm -rf dist', { stdio: 'inherit' });
execSync('npm run build:web', { stdio: 'inherit' });
execSync('npm run build:capacitor', { stdio: 'inherit' });
log('✅ Web assets built successfully');
};
-2
View File
@@ -147,7 +147,6 @@ export default config;
log('🔄 Building web assets before adding iOS platform...');
try {
execSync('rm -rf dist', { stdio: 'inherit' });
execSync('npm run build:web', { stdio: 'inherit' });
execSync('npm run build:capacitor', { stdio: 'inherit' });
log('✅ Web assets built successfully');
} catch (error) {
@@ -416,7 +415,6 @@ const generateTestData = async (log) => {
const buildWebAssets = async (log) => {
log('🌐 Building web assets...');
execSync('rm -rf dist', { stdio: 'inherit' });
execSync('npm run build:web', { stdio: 'inherit' });
execSync('npm run build:capacitor', { stdio: 'inherit' });
log('✅ Web assets built successfully');
};
+17 -6
View File
@@ -10,7 +10,7 @@
</div>
<!-- Content -->
<!-- This is somewhat similar to ClaimView.vue and ConfirmGiftView.vue -->
<!-- This is somewhat similar to ClaimView.vue -->
<div class="mb-4">
<p class="mb-4">
<span v-if="R.isEmpty(visibleToDids)">
@@ -21,10 +21,17 @@
<div v-if="R.isEmpty(visibleToDids)">
<p class="mt-2">
You can ask one of your contacts to take a look and see if their
contacts can see more details. Someone is connected to people closer
to them; if you don't know who to ask, try the person who registered
you.
Someone is still closer to them than you are.
<router-link
v-if="claimJwtId"
:to="{ path: '/claim/' + encodeURIComponent(claimJwtId) }"
class="text-blue-500"
@click="close"
>Open the record to see who can introduce you.</router-link
>
<span v-else>
If you don't know who to ask, try the person who registered you.
</span>
</p>
</div>
@@ -119,8 +126,9 @@ import { createNotifyHelpers } from "@/utils/notify";
import { TIMEOUTS } from "@/utils/notify";
import { NOTIFY_COPIED_TO_CLIPBOARD } from "@/constants/notifications";
import { APP_SERVER } from "@/constants/app";
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
@Component({ name: "HiddenDidDialog" })
@Component({ name: "HiddenDidDialog", mixins: [PlatformServiceMixin] })
export default class HiddenDidDialog extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
notify!: ReturnType<typeof createNotifyHelpers>;
@@ -132,6 +140,7 @@ export default class HiddenDidDialog extends Vue {
activeDid = "";
allMyDids: Array<string> = [];
canShare = false;
claimJwtId = "";
deepLinkPathSuffix = "";
deepLinkUrl = window.location.href; // this is changed to a deep link in the setup
@@ -171,7 +180,9 @@ export default class HiddenDidDialog extends Vue {
allContacts: Array<Contact>,
activeDid: string,
allMyDids: Array<string>,
claimJwtId = "",
) {
this.claimJwtId = claimJwtId;
this.deepLinkPathSuffix = deepLinkPathSuffix;
this.roleName = roleName;
this.visibleToDids = visibleToDids;
+350
View File
@@ -0,0 +1,350 @@
<template>
<!--
Nearest neighbors in the registration graph between the user and the people
in a claim or profile. Everyone registered is connected through the
registration tree, so there is always someone one step closer; nothing is
fetched until the user expands this section.
-->
<div ref="section" data-testId="networkConnections">
<h2
class="text-lg font-semibold text-blue-500 cursor-pointer"
data-testId="networkConnectionsToggle"
@click="toggle()"
>
Who Can Introduce You
<font-awesome :icon="isExpanded ? 'chevron-down' : 'chevron-right'" />
</h2>
<div v-if="isExpanded" class="mt-2">
<p class="text-sm text-slate-700 mb-3">
Everyone on this server is connected to you through the people who
registered each other, so someone is always one step closer to
{{ subjectDescription }}. Ask that person for an introduction.
</p>
<p v-if="!isRegistered" class="text-sm text-slate-700">
You are not registered yet, so you are not connected to anyone. The
person who registers you will be your first connection to everyone else;
find someone on the Help page.
</p>
<div v-else-if="isLoading" class="flex justify-center items-center py-8">
<font-awesome
icon="spinner"
class="fa-spin-pulse text-2xl text-slate-400"
/>
</div>
<div
v-else-if="errorMessage"
class="bg-red-50 border border-red-300 rounded-md p-4"
>
<div class="flex items-start gap-2">
<font-awesome
icon="exclamation-triangle"
class="text-red-500 mt-0.5"
/>
<p class="text-red-700">{{ errorMessage }}</p>
</div>
</div>
<p
v-else-if="Object.keys(neighborsByDid).length === 0"
class="text-sm text-slate-500 italic"
>
Nobody else is involved here.
</p>
<div v-else>
<div v-for="(neighbors, did) in neighborsByDid" :key="did" class="mb-4">
<h3
v-if="Object.keys(neighborsByDid).length > 1"
class="text-sm font-medium text-slate-600 mb-1"
>
Near {{ displayName(did as string) }}:
</h3>
<!-- the server only returns no neighbors for an unregistered DID -->
<p
v-if="neighbors.length === 0"
class="text-sm text-slate-500 italic"
>
{{ capitalize(displayName(did as string)) }} is not registered on
this server, so nobody here is connected to them. The data may be a
mistake, or a test, or a reference to someone on a different system.
</p>
<p
v-else-if="neighbors[0].did === did"
class="text-sm text-slate-700"
>
You are directly connected:
{{
neighbors[0].relation === "REGISTERED_BY_YOU"
? "you registered them."
: "they registered you."
}}
</p>
<div v-else class="space-y-2">
<div
v-for="neighbor in neighbors"
:key="neighbor.did"
class="bg-slate-50 border border-slate-300 rounded-md"
>
<div class="flex items-center justify-between gap-3 p-3">
<div class="flex items-center gap-2 flex-1 min-w-0">
<button
:title="`Copy ${linkName.toLowerCase()} and expand`"
class="text-blue-600 flex-shrink-0"
@click="onNeighborExpandClick(neighbor.did)"
>
<font-awesome
:icon="
expandedNeighborDid === neighbor.did
? 'chevron-down'
: 'chevron-right'
"
class="text-sm"
/>
{{ displayName(neighbor.did) }}
</button>
<span :class="relationBadgeClass(neighbor.relation)">
{{ relationLabel(neighbor.relation) }}
</span>
</div>
</div>
<div
v-if="expandedNeighborDid === neighbor.did"
class="border-t border-slate-300 p-3 bg-white"
>
<router-link
:to="{ path: '/did/' + encodeURIComponent(neighbor.did) }"
class="text-blue-600 hover:text-blue-800 font-medium underline"
>
Go to contact info
</router-link>
and send them the {{ linkName.toLowerCase() }} from your
clipboard. Ask them for an introduction.
<div
v-if="isNotInContacts(neighbor.did)"
class="flex flex-col gap-1 mt-2"
>
<p class="text-xs text-slate-600">
This person is connected to you, but they are not in this
device's contacts. Copy this DID link and check on another
device or check with different people.
</p>
<span class="flex items-center gap-1 min-w-0">
<span class="text-xs truncate text-slate-600 min-w-0">
{{ neighbor.did }}
</span>
<button
title="Copy DID Link"
class="text-blue-600 hover:text-blue-800 underline cursor-pointer flex-shrink-0"
@click.prevent="onCopyDidClick(neighbor.did)"
>
<font-awesome icon="copy" class="text-sm" />
</button>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script lang="ts">
import { Component, Prop, Vue } from "vue-facing-decorator";
import { APP_SERVER, NotificationIface } from "../constants/app";
import { Contact } from "../db/tables/contacts";
import * as serverUtil from "../libs/endorserServer";
import { copyToClipboard } from "../services/ClipboardService";
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
interface Neighbor {
did: string;
relation: string;
}
/**
* Expandable list of the people one step closer, in the registration tree,
* to each person in a claim or profile.
*
* Exactly one of claimId or profileId is expected. The claim endpoint returns
* neighbors keyed by each DID in the claim; the profile endpoint returns one
* list for the profile owner (keyed here by profileDid).
*/
@Component({ name: "NetworkConnections", mixins: [PlatformServiceMixin] })
export default class NetworkConnections extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
@Prop({ required: true }) activeDid!: string;
@Prop({ default: () => [] }) allContacts!: Array<Contact>;
@Prop({ default: () => [] }) allMyDids!: Array<string>;
/** endorser server for claims, partner server for profiles */
@Prop({ required: true }) apiServer!: string;
@Prop() claimId?: string;
@Prop({ required: true }) isRegistered!: boolean;
/** deep link copied for the user to send to a neighbor */
@Prop({ required: true }) link!: string;
/** eg. "Claim link" */
@Prop({ required: true }) linkName!: string;
@Prop() profileDid?: string;
@Prop() profileId?: string;
/** eg. "this person" */
@Prop({ required: true }) subjectDescription!: string;
notify!: ReturnType<typeof createNotifyHelpers>;
errorMessage = "";
expandedNeighborDid: string | null = null;
isExpanded = false;
isLoaded = false;
isLoading = false;
neighborsByDid: Record<string, Array<Neighbor>> = {};
created() {
this.notify = createNotifyHelpers(this.$notify);
}
async toggle() {
if (this.isExpanded) {
this.isExpanded = false;
} else {
await this.expand();
}
}
/**
* Opens the section and loads the neighbors the first time.
* @param scroll whether to bring the section into view, for links elsewhere on the page
*/
async expand(scroll = false) {
this.isExpanded = true;
if (scroll) {
(this.$refs.section as HTMLElement | undefined)?.scrollIntoView({
behavior: "smooth",
});
}
if (!this.isLoaded && !this.isLoading && this.isRegistered) {
await this.loadNeighbors();
}
}
async loadNeighbors() {
this.isLoading = true;
this.errorMessage = "";
try {
const url = this.claimId
? this.apiServer +
"/api/claim/claimNearestNeighbors/" +
encodeURIComponent(this.claimId)
: this.apiServer +
"/api/partner/userProfileNearestNeighbors/" +
encodeURIComponent(this.profileId || "");
const headers = await serverUtil.getHeaders(this.activeDid);
const response = await fetch(url, { headers });
if (response.status !== 200) {
throw new Error(`Status ${response.status} from ${url}`);
}
const data = (await response.json()).data;
const raw: Record<string, unknown> = this.claimId
? data || {}
: { [this.profileDid || ""]: data };
const result: Record<string, Array<Neighbor>> = {};
for (const [did, neighbors] of Object.entries(raw)) {
// the user's own entry adds nothing since "You" is already known
if (did === this.activeDid) continue;
// the server sends an {error} object instead of a list when one lookup fails
if (!Array.isArray(neighbors)) {
throw new Error(`Error for ${did}: ${JSON.stringify(neighbors)}`);
}
result[did] = neighbors.filter((neighbor: Neighbor) => neighbor.did);
}
this.neighborsByDid = result;
this.isLoaded = true;
} catch (error) {
this.$logAndConsole(`Error loading network connections: ${error}`, true);
this.errorMessage =
"An error occurred while loading network connections.";
} finally {
this.isLoading = false;
}
}
displayName(did: string): string {
// the server keys a DID hidden from this user as HIDDEN_DID + "_" + index
const isHiddenKey = did.startsWith(serverUtil.HIDDEN_DID + "_");
return serverUtil.didInfo(
isHiddenKey ? serverUtil.HIDDEN_DID : did,
this.activeDid,
this.allMyDids,
this.allContacts,
);
}
capitalize(text: string): string {
return text.charAt(0).toUpperCase() + text.slice(1);
}
isNotInContacts(did: string): boolean {
return !this.allContacts.some((contact) => contact.did === did);
}
relationLabel(relation: string): string {
switch (relation) {
case "REGISTERED_BY_YOU":
return "Registered by You";
case "REGISTERED_YOU":
return "Registered You";
case "TARGET":
return "Yourself";
default:
return relation;
}
}
relationBadgeClass(relation: string): string {
const baseClasses =
"text-xs font-semibold px-2 py-1 rounded whitespace-nowrap";
switch (relation) {
case "REGISTERED_BY_YOU":
return `${baseClasses} bg-blue-100 text-blue-700`;
case "REGISTERED_YOU":
return `${baseClasses} bg-green-100 text-green-700`;
case "TARGET":
return `${baseClasses} bg-purple-100 text-purple-700`;
default:
return `${baseClasses} bg-slate-100 text-slate-700`;
}
}
/**
* Copies the link for the neighbor and toggles their instructions
*/
async onNeighborExpandClick(did: string) {
if (this.expandedNeighborDid === did) {
this.expandedNeighborDid = null;
return;
}
try {
await copyToClipboard(this.link);
this.notify.copied(this.linkName, TIMEOUTS.STANDARD);
} catch (error) {
this.$logAndConsole(`Error copying ${this.linkName}: ${error}`, true);
this.notify.error(`Failed to copy ${this.linkName.toLowerCase()}.`);
}
this.expandedNeighborDid = did;
}
async onCopyDidClick(did: string) {
const deepLink = `${APP_SERVER}/deep-link/did/${encodeURIComponent(did)}`;
try {
await copyToClipboard(deepLink);
this.notify.copied("DID link", TIMEOUTS.STANDARD);
} catch (error) {
this.$logAndConsole(`Error copying DID link: ${error}`, true);
this.notify.error("Failed to copy DID link.");
}
}
}
</script>
+191
View File
@@ -0,0 +1,191 @@
<template>
<div>
<!-- claims, and gifts & offers -->
<div v-if="kind === 'claim'" class="flex items-start gap-2">
<div class="grow min-w-0">
<span class="font-medium">{{ claimTypeText }}</span>
<span v-if="claimDescription" class="block truncate">{{
claimDescription
}}</span>
<span class="block text-sm text-slate-500">
from {{ personName(claimRow.issuer) }}
<template v-if="claimRow.issuedAt">
· {{ formatDate(claimRow.issuedAt) }}
</template>
</span>
</div>
<router-link
:to="{ path: '/claim/' + encodeURIComponent(claimRow.id) }"
class="text-blue-500 flex-shrink-0"
>
<font-awesome icon="file-lines" />
</router-link>
</div>
<!-- projects -->
<div v-else-if="kind === 'plan'">
<div class="flex items-start gap-2">
<div class="grow min-w-0">
<span class="font-medium">{{
planRow.name || "Unnamed Project"
}}</span>
<span
v-if="similarity !== undefined"
class="text-sm text-slate-500 ml-2"
>{{ similarity }}% match</span
>
<span v-if="planRow.description" class="block truncate">{{
planRow.description
}}</span>
</div>
<router-link
:to="{ path: '/project/' + encodeURIComponent(planRow.handleId) }"
class="text-blue-500 flex-shrink-0"
>
<font-awesome icon="file-lines" />
</router-link>
</div>
<PlanChangeDiff
v-if="planChange"
:plan-change="planChange"
:active-did="activeDid"
:all-my-dids="allMyDids"
:all-contacts="allContacts"
/>
</div>
<!-- profiles -->
<div v-else-if="kind === 'profile'" class="flex items-start gap-2">
<div class="grow min-w-0">
<span class="font-medium">{{ personName(profileRow.issuerDid) }}</span>
<span
v-if="similarity !== undefined"
class="text-sm text-slate-500 ml-2"
>{{ similarity }}% match</span
>
<span class="block truncate">{{ profileRow.description }}</span>
</div>
<router-link
v-if="profileRow.rowId !== undefined"
:to="{
path: '/user-profile/' + encodeURIComponent(String(profileRow.rowId)),
}"
class="text-blue-500 flex-shrink-0"
>
<font-awesome icon="file-lines" />
</router-link>
</div>
</div>
</template>
<script lang="ts">
import { Component, Prop, Vue } from "vue-facing-decorator";
import PlanChangeDiff from "./PlanChangeDiff.vue";
import { Contact } from "../db/tables/contacts";
import type {
AlertSearchJwtWithClaimRecord,
AlertSearchPlanRecord,
AlertSearchProfileRecord,
} from "../interfaces/alertSearch";
import { PlanSummaryAndPreviousClaim } from "../interfaces/records";
import { didInfo } from "../libs/endorserServer";
import type { NewActivityBucket } from "../libs/newActivity";
type RowKind = "claim" | "plan" | "profile";
const BUCKET_KINDS: Record<NewActivityBucket, RowKind> = {
claims: "claim",
personalPlanContributions: "claim",
trackedPlanClaims: "claim",
trackedPlanUpdates: "plan",
plansNearby: "plan",
plansSimilar: "plan",
profilesNearby: "profile",
profilesSimilar: "profile",
};
/** Readable names for the claim types alertSearch returns most. */
const CLAIM_TYPE_TEXT: Record<string, string> = {
AgreeAction: "Agreement",
GiveAction: "Gift",
JoinAction: "Join",
Offer: "Offer",
PlanAction: "Project",
RegisterAction: "Registration",
};
/** One row of a New Activity bucket, shaped by the kind of record it is. */
@Component({ components: { PlanChangeDiff } })
export default class NewActivityRow extends Vue {
@Prop({ required: true }) bucket!: NewActivityBucket;
@Prop({ required: true }) row!: unknown;
@Prop({ required: true }) activeDid!: string;
@Prop({ default: () => [] }) allMyDids!: string[];
@Prop({ default: () => [] }) allContacts!: Contact[];
@Prop() planChange?: PlanSummaryAndPreviousClaim;
get kind(): RowKind {
return BUCKET_KINDS[this.bucket];
}
/** Similar matches wrap the record with its similarity, 0 to 1. */
get record(): Record<string, unknown> {
const row = this.row as Record<string, unknown>;
return ((row.profile ?? row.plan ?? row) as Record<string, unknown>) || {};
}
get similarity(): number | undefined {
const value = (this.row as { similarity?: unknown }).similarity;
return typeof value === "number" ? Math.round(value * 100) : undefined;
}
get claimRow(): AlertSearchJwtWithClaimRecord {
return this.record as unknown as AlertSearchJwtWithClaimRecord;
}
get planRow(): AlertSearchPlanRecord {
return this.record as unknown as AlertSearchPlanRecord;
}
get profileRow(): AlertSearchProfileRecord {
return this.record as unknown as AlertSearchProfileRecord;
}
get claimTypeText(): string {
const type = this.claimRow.claimType || "";
return CLAIM_TYPE_TEXT[type] || type || "Claim";
}
/** The description inside the claim text, when the row carries it. */
get claimDescription(): string {
const text = this.claimRow.claim;
if (!text) return "";
try {
const claim = JSON.parse(text) as Record<string, unknown>;
const subject = (claim.credentialSubject ?? claim) as Record<
string,
unknown
>;
const object = subject.object as Record<string, unknown> | undefined;
const offered = subject.itemOffered as
| Record<string, unknown>
| undefined;
const description =
subject.description ?? object?.description ?? offered?.description;
return typeof description === "string" ? description : "";
} catch {
return "";
}
}
personName(did: string | undefined): string {
return didInfo(did, this.activeDid, this.allMyDids, this.allContacts);
}
formatDate(value: string): string {
const date = new Date(value);
return isNaN(date.getTime()) ? value : date.toLocaleDateString();
}
}
</script>
+492
View File
@@ -0,0 +1,492 @@
<template>
<div>
<div
v-if="getPlanDifferences(planChange.plan.handleId)"
class="text-sm mt-2"
>
<div class="font-medium mb-2">Changes</div>
<div class="overflow-x-auto">
<table
class="w-full text-xs border-collapse border border-gray-300 rounded-lg shadow-sm bg-white"
>
<thead>
<tr class="bg-gray-50">
<th
class="border border-gray-300 px-3 py-2 text-left font-semibold text-gray-700"
></th>
<th
class="border border-gray-300 px-3 py-2 text-left font-semibold text-gray-700"
>
Previous
</th>
<th
class="border border-gray-300 px-3 py-2 text-left font-semibold text-gray-700"
>
Current
</th>
</tr>
</thead>
<tbody>
<tr
v-for="(difference, field) in getPlanDifferences(
planChange.plan.handleId,
)"
:key="field"
class="hover:bg-gray-50"
>
<td
class="border border-gray-300 px-3 py-2 font-medium text-gray-800 break-words"
>
{{ getDisplayFieldName(field) }}
</td>
<template v-if="field === 'description'">
<td
colspan="2"
class="border border-gray-300 px-3 py-2 break-words align-top"
>
<div class="w-3/5 mx-auto">
<div
v-for="(change, index) in getDescriptionDiff(
difference.old,
difference.new,
)"
:key="index"
>
<vue-markdown
:source="change.value"
:style="getDiffStyle(change)"
class="markdown-content inline-block"
/>
</div>
</div>
</td>
</template>
<template v-else>
<td
class="border border-gray-300 px-3 py-2 text-gray-600 break-words align-top"
>
<span>{{ formatFieldValue(difference.old) }}</span>
</td>
<td
class="border border-gray-300 px-3 py-2 text-green-700 font-medium break-words align-top"
>
<span>{{ formatFieldValue(difference.new) }}</span>
</td>
</template>
</tr>
</tbody>
</table>
</div>
</div>
<div v-else>
The changes are not important, like it was saved by accident or you've
seen it all before.
</div>
</div>
</template>
<script lang="ts">
/**
* What changed in a starred project since the claim before the change: a
* table of previous and current values, with a line diff of the description.
*/
import { Component, Prop, Vue } from "vue-facing-decorator";
import VueMarkdown from "vue-markdown-render";
import { diffLines, Change } from "diff";
import * as R from "ramda";
import { Contact } from "../db/tables/contacts";
import { GenericCredWrapper } from "@/interfaces";
import { PlanActionClaim } from "../interfaces/claims";
import {
PlanSummaryAndPreviousClaim,
PlanSummaryRecord,
} from "../interfaces/records";
import { didInfoOrNobody } from "../libs/endorserServer";
import { logger } from "../utils/logger";
@Component({ components: { VueMarkdown } })
export default class PlanChangeDiff extends Vue {
@Prop({ required: true }) planChange!: PlanSummaryAndPreviousClaim;
@Prop({ required: true }) activeDid!: string;
@Prop({ default: () => [] }) allMyDids!: string[];
@Prop({ default: () => [] }) allContacts!: Contact[];
planDifferences: Record<
string,
Record<string, { old: unknown; new: unknown }>
> = {};
created() {
this.analyzePlanDifferences([this.planChange]);
}
/**
* Analyzes differences between current plans and their previous claims
*
* Walks through a list of PlanSummaryAndPreviousClaim items and stores the
* differences between the previous claim and the current plan. This method
* extracts the claim from the wrappedClaimBefore object and compares relevant
* fields with the current plan.
*
* @param planChanges Array of PlanSummaryAndPreviousClaim objects to analyze
*/
analyzePlanDifferences(planChanges: Array<PlanSummaryAndPreviousClaim>) {
this.planDifferences = {};
for (const planChange of planChanges) {
const currentPlan: PlanSummaryRecord = planChange.plan;
const wrappedClaim: GenericCredWrapper<PlanActionClaim> | undefined =
planChange.wrappedClaimBefore;
// Extract the actual claim from the wrapped claim
let previousClaim: PlanActionClaim | undefined;
const embeddedClaim: PlanActionClaim | undefined = wrappedClaim?.claim;
if (
embeddedClaim &&
typeof embeddedClaim === "object" &&
"credentialSubject" in embeddedClaim
) {
// It's a Verifiable Credential
previousClaim =
(embeddedClaim.credentialSubject as PlanActionClaim) || embeddedClaim;
} else {
// It's a direct claim
previousClaim = embeddedClaim;
}
if (!previousClaim) {
// Can happen when a project is starred after the stored last-seen-change-jwt ID
// so we'll just leave the message saying there are no important differences.
continue;
}
const differences: Record<string, { old: unknown; new: unknown }> = {};
// Compare name
const normalizedOldName = this.normalizeValueForComparison(
previousClaim.name,
);
const normalizedNewName = this.normalizeValueForComparison(
currentPlan.name,
);
if (!R.equals(normalizedOldName, normalizedNewName)) {
differences.name = {
old: previousClaim.name,
new: currentPlan.name,
};
}
// Compare description
const normalizedOldDescription = this.normalizeValueForComparison(
previousClaim.description,
);
const normalizedNewDescription = this.normalizeValueForComparison(
currentPlan.description,
);
if (!R.equals(normalizedOldDescription, normalizedNewDescription)) {
differences.description = {
old: previousClaim.description,
new: currentPlan.description,
};
}
// Compare location (combine latitude and longitude into one row)
const oldLat = this.normalizeValueForComparison(
previousClaim.location?.geo?.latitude,
);
const oldLon = this.normalizeValueForComparison(
previousClaim.location?.geo?.longitude,
);
const newLat = this.normalizeValueForComparison(currentPlan.locLat);
const newLon = this.normalizeValueForComparison(currentPlan.locLon);
if (!R.equals(oldLat, newLat) || !R.equals(oldLon, newLon)) {
differences.location = {
old: this.formatLocationValue(oldLat, oldLon, true),
new: this.formatLocationValue(newLat, newLon, false),
};
}
// Compare agent (issuer)
const oldAgent = didInfoOrNobody(
previousClaim.agent?.identifier,
this.activeDid,
this.allMyDids,
this.allContacts,
);
const newAgent = didInfoOrNobody(
currentPlan.agentDid,
this.activeDid,
this.allMyDids,
this.allContacts,
);
const normalizedOldAgent = this.normalizeValueForComparison(oldAgent);
const normalizedNewAgent = this.normalizeValueForComparison(newAgent);
if (!R.equals(normalizedOldAgent, normalizedNewAgent)) {
differences.agent = {
old: oldAgent,
new: newAgent,
};
}
// Compare start time
const oldStartTime = previousClaim.startTime;
const newStartTime = currentPlan.startTime;
const normalizedOldStartTime =
this.normalizeDateForComparison(oldStartTime);
const normalizedNewStartTime =
this.normalizeDateForComparison(newStartTime);
if (!R.equals(normalizedOldStartTime, normalizedNewStartTime)) {
differences.startTime = {
old: oldStartTime,
new: newStartTime,
};
}
// Compare end time
const oldEndTime = previousClaim.endTime;
const newEndTime = currentPlan.endTime;
const normalizedOldEndTime = this.normalizeDateForComparison(oldEndTime);
const normalizedNewEndTime = this.normalizeDateForComparison(newEndTime);
if (!R.equals(normalizedOldEndTime, normalizedNewEndTime)) {
differences.endTime = {
old: oldEndTime,
new: newEndTime,
};
}
// Compare image
const oldImage = previousClaim.image;
const newImage = currentPlan.image;
const normalizedOldImage = this.normalizeValueForComparison(oldImage);
const normalizedNewImage = this.normalizeValueForComparison(newImage);
if (!R.equals(normalizedOldImage, normalizedNewImage)) {
differences.image = {
old: oldImage,
new: newImage,
};
}
// Compare url
const oldUrl = previousClaim.url;
const newUrl = currentPlan.url;
const normalizedOldUrl = this.normalizeValueForComparison(oldUrl);
const normalizedNewUrl = this.normalizeValueForComparison(newUrl);
if (!R.equals(normalizedOldUrl, normalizedNewUrl)) {
differences.url = {
old: oldUrl,
new: newUrl,
};
}
// Store differences if any were found
if (!R.isEmpty(differences)) {
this.planDifferences[currentPlan.handleId] = differences;
logger.debug(
"[PlanChangeDiff] Plan differences found for",
currentPlan.handleId,
differences,
);
}
}
logger.debug(
"[PlanChangeDiff] Analyzed",
planChanges.length,
"plan changes, found differences in",
Object.keys(this.planDifferences).length,
"plans",
);
}
/**
* Normalizes values for comparison - treats null, undefined, and empty string as equivalent
*
* @param value The value to normalize
* @returns The normalized value (null for null/undefined/empty, otherwise the original value)
*/
normalizeValueForComparison<T>(value: T | null | undefined): T | null {
if (value === null || value === undefined || value === "") {
return null;
}
return value;
}
/**
* Normalizes date values for comparison by converting strings to Date objects
* Returns null for null/undefined/empty values, Date objects for valid date strings
*/
normalizeDateForComparison(value: unknown): Date | null {
if (value === null || value === undefined || value === "") {
return null;
}
if (typeof value === "string") {
const date = new Date(value);
// Check if the date is valid
return isNaN(date.getTime()) ? null : date;
}
if (value instanceof Date) {
return isNaN(value.getTime()) ? null : value;
}
return null;
}
/**
* Gets the differences for a specific plan by handle ID
*
* @param handleId The handle ID of the plan to get differences for
* @returns The differences object or null if no differences found
*/
getPlanDifferences(
handleId: string,
): Record<string, { old: unknown; new: unknown }> | null {
return this.planDifferences[handleId] || null;
}
/**
* Formats a field value for display in the UI
*
* @param value The value to format
* @returns A human-readable string representation
*/
formatFieldValue(value: unknown): string {
if (value === null || value === undefined) {
return "Not set";
}
if (typeof value === "string") {
const stringValue = value || "Empty";
// Check if it's a date/time string
if (this.isDateTimeString(stringValue)) {
return this.formatDateTime(stringValue);
}
// Check if it's a URL
if (this.isUrl(stringValue)) {
return stringValue; // Keep URLs as-is for now
}
return stringValue;
}
if (typeof value === "number") {
return value.toString();
}
if (typeof value === "boolean") {
return value ? "Yes" : "No";
}
// For complex objects, stringify
const stringified = JSON.stringify(value);
return stringified;
}
/**
* Checks if a string appears to be a date/time string
*/
isDateTimeString(value: string): boolean {
if (!value) return false;
// Check for ISO 8601 format or other common date formats
const dateRegex = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2})?(\.\d{3})?Z?$/;
return dateRegex.test(value) || !isNaN(Date.parse(value));
}
/**
* Checks if a string is a URL
*/
isUrl(value: string): boolean {
if (!value) return false;
try {
new URL(value);
return true;
} catch {
return false;
}
}
/**
* Formats a date/time string for display
*/
formatDateTime(value: string): string {
try {
const date = new Date(value);
return date.toLocaleString();
} catch {
return value; // Return original if parsing fails
}
}
/**
* Gets a human-readable field name for display
*
* @param fieldName The internal field name
* @returns A formatted field name for display
*/
getDisplayFieldName(fieldName: string): string {
const fieldNameMap: Record<string, string> = {
name: "Name",
description: "Description",
location: "Location",
agent: "Agent",
startTime: "Start Time",
endTime: "End Time",
image: "Image",
url: "URL",
};
return fieldNameMap[fieldName] || fieldName;
}
/**
* Formats location values for display
*
* @param latitude The latitude value
* @param longitude The longitude value
* @param isOldValue Whether this is the old value (true) or new value (false)
* @returns A formatted location string
*/
formatLocationValue(
latitude: number | undefined | null,
longitude: number | undefined | null,
isOldValue: boolean = false,
): string {
if (latitude == null && longitude == null) {
return "Not set";
}
// If there's any location data, show generic labels instead of coordinates
if (isOldValue) {
return "A Location";
} else {
return "New Location";
}
}
/**
* Computes the line-by-line diff between two description strings
*
* @param oldValue The old description value
* @param newValue The new description value
* @returns An array of Change objects from the diff library
*/
getDescriptionDiff(oldValue: unknown, newValue: unknown): Change[] {
const oldStr = this.formatFieldValue(oldValue);
const newStr = this.formatFieldValue(newValue);
return diffLines(oldStr, newStr);
}
/**
* Gets the background color style for a diff change
*
* @param change A Change object from the diff library
* @returns A CSS style object with background color
*/
getDiffStyle(change: Change): Record<string, string> {
if (change.added) {
return { backgroundColor: "#d4edda" }; // Light green
}
if (change.removed) {
return { backgroundColor: "#f8d7da" }; // Light red
}
return {};
}
}
</script>
+6 -61
View File
@@ -13,10 +13,11 @@ import { THAT_UNNAMED_PERSON } from "./entities";
// Constants marked with "[Component usage not yet documented]" need their
// usage locations verified and documented.
// Used in: [Component usage not yet documented]
// Used in: ActivityListItem.vue (notifyHiddenPerson - hidden issuer, giver, or recipient)
export const NOTIFY_PERSON_HIDDEN = {
title: "Person Outside Your Network",
message: "This person is not visible to you.",
message:
"This person is not visible to you. Open the record to see who can introduce you.",
};
// Used in: [Component usage not yet documented]
@@ -357,55 +358,18 @@ export const NOTIFY_OFFER_PRIVACY_INFO = {
message: "Your data is shared with the world when you sign and send.",
};
// ConfirmGiftView.vue specific constants
// Used in: ConfirmGiftView.vue (mounted method - error loading gift details)
export const NOTIFY_GIFT_ERROR_LOADING = {
title: "Error",
message: "There was an error loading the gift details.",
};
// Used in: ConfirmGiftView.vue (confirm method - no identifier error)
export const NOTIFY_GIFT_ERROR_NO_IDENTIFIER = {
title: "Error",
message: "You must select an identifier before you can record a gift.",
};
// Used in: ConfirmGiftView.vue (confirm method - negative amount error)
// Used in: GiftedDialog.vue, GiftedDetailsView.vue (negative amount error)
export const NOTIFY_GIFT_ERROR_NEGATIVE_AMOUNT = {
title: "",
message: "You may not send a negative number.",
};
// Used in: ConfirmGiftView.vue (confirm method - no description error)
// Used in: GiftedDialog.vue, GiftedDetailsView.vue (no description error)
export const NOTIFY_GIFT_ERROR_NO_DESCRIPTION = {
title: "Error",
message: "You must enter a description or some number of {unit}.",
};
// Used in: ConfirmGiftView.vue (confirm method - processing status)
export const NOTIFY_GIFT_PROCESSING = {
title: "",
message: "Recording the gift...",
};
// Used in: ConfirmGiftView.vue (recordGift method - creation error)
export const NOTIFY_GIFT_ERROR_CREATION = {
title: "Error",
message: "There was an error creating the gift.",
};
// Used in: ConfirmGiftView.vue (recordGift method - success)
export const NOTIFY_GIFT_SUCCESS_RECORDED = {
title: "Success",
message: "That gift was recorded.",
};
// Used in: ConfirmGiftView.vue (recordGift method - recordation error)
export const NOTIFY_GIFT_ERROR_RECORDATION = {
title: "Error",
message: "There was an error recording the gift.",
};
// Used in: [Component usage not yet documented]
export const NOTIFY_REGISTER_PROCESSING = {
title: "Processing",
@@ -1098,26 +1062,7 @@ export function createCombinedSuccessMessage(
}
}
// ConfirmGiftView.vue additional constants
// Used in: ConfirmGiftView.vue (confirmClaim method - success)
export const NOTIFY_GIFT_CONFIRMATION_SUCCESS = {
title: "Success",
message: "Confirmation submitted.",
};
// Used in: ConfirmGiftView.vue (confirmClaim method - error)
export const NOTIFY_GIFT_CONFIRMATION_ERROR = {
title: "Error",
message: "There was a problem submitting the confirmation.",
};
// Used in: ConfirmGiftView.vue (confirmConfirmClaim method - confirm modal)
export const NOTIFY_GIFT_CONFIRM_MODAL = {
title: "Confirm",
message: "Do you personally confirm that this is true?",
};
// Used in: ConfirmGiftView.vue (copyToClipboard method - copied toast)
// Used in: HiddenDidDialog.vue, QuickActionBvcEndView.vue (copied toast)
export const NOTIFY_COPIED_TO_CLIPBOARD = {
title: "Copied",
message: (description?: string) =>
+7
View File
@@ -299,6 +299,13 @@ const MIGRATIONS = [
ALTER TABLE settings ADD COLUMN imageServer TEXT;
`,
},
{
name: "012_add_newActivityCursors_to_settings",
sql: `
-- JSON of the alertSearch cursors the New Activity screen counts from
ALTER TABLE settings ADD COLUMN newActivityCursors TEXT;
`,
},
];
/**
-1
View File
@@ -298,7 +298,6 @@ export async function logToDb(
}
}
// similar method is in the sw_scripts/additional-scripts.js file
export async function logConsoleAndDb(
message: string,
isError = false,
-1
View File
@@ -302,7 +302,6 @@ export async function logToDb(message: string): Promise<void> {
await db.logs.update(todayKey, { message: fullMessage });
}
// similar method is in the sw_scripts/additional-scripts.js file
export async function logConsoleAndDb(
message: string,
isError = false,
+3
View File
@@ -45,6 +45,9 @@ export type Settings = {
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
lastAckedStarredPlanChangesJwtId?: string; // the last JWT ID for starred plan changes that they've acknowledged seeing
// JSON text of NewActivityCursorState (src/libs/newActivity.ts): the alertSearch cursors for the New Activity screen
newActivityCursors?: string;
// The claim list has a most recent one used in notifications that's separate from the last viewed
lastNotifiedClaimId?: string;
lastViewedClaimId?: string;
+53 -2
View File
@@ -19,15 +19,28 @@
/**
* Server-issued ULID on a stored JWT/plan record, used as alertSearch afterId /
* beforeId. Not an authentication JWT and not a delegated notification JWT.
* Superseded by AlertSearchCursor for "what changed since" queries.
*/
export type AlertSearchCursorUlid = string;
/**
* Opaque cursor: a position between changes on one server. Responses return
* `nextAfterCursor` and `nextBeforeCursor`; requests send them back as
* `afterCursor` (changes after it, oldest first) or `beforeCursor` (changes
* before it, newest first). Store it as text and never parse or compare it;
* its format belongs to the server (see endorser-ch
* CHANGE/PLAN-accurate-cursors.md).
*/
export type AlertSearchCursor = string;
/**
* JWT row from endorser `jwtsWithDidAfterId` (no claim body).
* Cursor field: `id`.
*/
export interface AlertSearchClaimRecord {
id: AlertSearchCursorUlid;
/** Server change sequence of this row; ascending within a cursor-path list. */
changeSeq?: number;
issuedAt: string;
issuer: string;
subject?: string;
@@ -54,6 +67,8 @@ export interface AlertSearchJwtWithClaimRecord extends AlertSearchClaimRecord {
export interface AlertSearchPlanRecord {
handleId: string;
jwtId: AlertSearchCursorUlid;
/** Server change sequence of this row; ascending within a cursor-path list. */
changeSeq?: number;
issuerDid?: string;
agentDid?: string;
fulfillsLinkConfirmed?: boolean | number;
@@ -77,6 +92,8 @@ export interface AlertSearchPlanRecord {
*/
export interface AlertSearchProfileRecord {
rowId?: number;
/** Server change sequence of this row; ascending within a cursor-path list. */
changeSeq?: number;
issuerDid: string;
updatedAt?: string;
description: string;
@@ -94,18 +111,43 @@ export interface EndorserAlertSearchData {
plansNearby: AlertSearchPlanRecord[];
}
/**
* A profile or plan close in meaning to the requester's profile, from partner
* `profilesSimilar` / `plansSimilar` (best first; not paged).
*/
export interface AlertSearchSimilarProfile {
similarity: number;
profile: AlertSearchProfileRecord;
}
export interface AlertSearchSimilarPlan {
similarity: number;
plan: AlertSearchPlanRecord;
}
export interface PartnerAlertSearchData {
profilesNearby: AlertSearchProfileRecord[];
profilesSimilar?: AlertSearchSimilarProfile[];
plansSimilar?: AlertSearchSimilarPlan[];
}
/**
* Endorser GET/POST /api/v2/report/alertSearch body.
* Per-bucket SQL hitLimit is not currently copied onto this envelope.
* Timeouts may set `userMessage` instead.
* The cursors and `hasMore` are absent from servers that predate cursors.
* Timeouts may set `userMessage`; the cursor then does not move.
*/
export interface EndorserAlertSearchResponse {
data: EndorserAlertSearchData;
userMessage?: string;
/** Send as `afterCursor` to get what changed after this response. */
nextAfterCursor?: AlertSearchCursor;
/** Send as `beforeCursor` to scroll back past this response. */
nextBeforeCursor?: AlertSearchCursor;
/**
* A list was cut at its limit: call again in the same direction, with
* `afterCursor = nextAfterCursor` or `beforeCursor = nextBeforeCursor`.
*/
hasMore?: boolean;
}
/**
@@ -114,6 +156,15 @@ export interface EndorserAlertSearchResponse {
export interface PartnerAlertSearchResponse {
data: PartnerAlertSearchData;
userMessage?: string;
/** Send as `afterCursor` to get what changed after this response. */
nextAfterCursor?: AlertSearchCursor;
/** Send as `beforeCursor` to scroll back past this response. */
nextBeforeCursor?: AlertSearchCursor;
/**
* A list was cut at its limit: call again in the same direction, with
* `afterCursor = nextAfterCursor` or `beforeCursor = nextBeforeCursor`.
*/
hasMore?: boolean;
}
/**
+4
View File
@@ -103,6 +103,10 @@ export const deepLinkQuerySchemas = {
searchPeople: z.string().optional(),
hideOnboarding: z.string().optional(),
}),
// The start cursors a daily notification counted from, joined by "."
"new-activity": z.object({
c: z.string().optional(),
}),
"onboard-meeting-members": z.object({
password: z.string(),
}),
+20
View File
@@ -194,6 +194,26 @@ export interface AlertAuthorizationRequestBody {
jwts: DelegatedAlertJwt[];
}
/**
* Optional alertSearch state carried by either alert-authorization upload.
* The cursors replace the channel's stored cursors, so the next daily count
* starts from them; `planHandleIds` and `location` are what the daily search
* sends, and null clears them. An absent field keeps what the service has.
*/
export interface AlertSearchUploadState {
/** Letters, digits, `_`, `:` or `-`; at most 64. */
endorserAfterCursor?: string;
partnerAfterCursor?: string;
/** At most 200. */
planHandleIds?: string[] | null;
location?: {
minLocLat: number;
maxLocLat: number;
minLocLon: number;
maxLocLon: number;
} | null;
}
/** Success body of storing a batch, on either alert-authorization route. */
export interface AlertAuthorizationResponse {
success: true;
+191 -9
View File
@@ -1,5 +1,5 @@
/**
* Typed alertSearch API contract only. No HTTP client yet.
* alertSearch API contract and HTTP client.
*
* Hosts: use DEFAULT_ENDORSER_API_SERVER and DEFAULT_PARTNER_API_SERVER from
* `@/constants/app`. Do not duplicate those constants here.
@@ -14,23 +14,32 @@
* notify-api's push or SMS `alert-authorization` route.
* - Native background pool: `mintBackgroundJwtTokenPool` for daily-notification
* plugin prefetch. Unrelated to alertSearch and to the delegated batch.
* - alertSearch cursor ULID: server-issued record/JWT primary id (26-char
* ULID). `afterId` means ids strictly greater than that ULID; `beforeId`
* means strictly less. First daily run omits afterId. `beforeId` is for
* pagination within a run. These are not auth JWTs and not signed tokens.
* - alertSearch cursors: opaque server strings, positions between changes.
* To get what changed: send the stored value as `afterCursor`, store each
* response's `nextAfterCursor`, and while `hasMore` call again with
* `afterCursor = nextAfterCursor`. Every page is complete up to it.
* To scroll back, newest first: send `beforeCursor` (any cursor, eg. a
* `nextAfterCursor`), then `beforeCursor = nextBeforeCursor` while `hasMore`.
* A first run sends neither.
* - alertSearch ULIDs (`afterId` / `beforeId`): the older bounds, ignored when
* a cursor is sent. Not auth JWTs and not signed tokens.
*
* Truncation: each endorser bucket query uses a server hit-limit (typically
* 50). That flag is not currently returned on the alertSearch JSON envelope.
* Timeouts may add `userMessage`. A later caller must still paginate with
* beforeId when a bucket may be incomplete.
* See endorser-ch CHANGE/PLAN-accurate-cursors.md.
*/
import type { Axios } from "axios";
import type { BoundingBox } from "@/interfaces/accountView";
import type {
AlertSearchCursor,
AlertSearchCursorUlid,
CombinedAlertSearchData,
EndorserAlertSearchData,
EndorserAlertSearchResponse,
PartnerAlertSearchData,
PartnerAlertSearchResponse,
} from "@/interfaces/alertSearch";
import { getHeaders } from "@/libs/endorserServer";
export const ENDORSER_ALERT_SEARCH_PATH = "/api/v2/report/alertSearch";
export const PARTNER_ALERT_SEARCH_PATH = "/api/partner/alertSearch";
@@ -47,6 +56,10 @@ export interface AlertSearchLocationBBox {
* GET is the planned daily method; the server also accepts POST.
*/
export interface AlertSearchRequestParams {
/** Changes after this cursor, oldest first; the ID and date bounds are then ignored. */
afterCursor?: AlertSearchCursor;
/** Changes before this cursor (and after `afterCursor`, if given), newest first. */
beforeCursor?: AlertSearchCursor;
afterId?: AlertSearchCursorUlid;
beforeId?: AlertSearchCursorUlid;
afterDate?: string;
@@ -59,11 +72,180 @@ export interface AlertSearchRequestParams {
planHandleIds?: string[];
planIds?: string[];
handleIds?: string[];
/** Partner only: bounding box for profilesSimilar / plansSimilar (everywhere without it). */
similarLocation?: AlertSearchLocationBBox;
}
export type {
AlertSearchCursor,
AlertSearchCursorUlid,
CombinedAlertSearchData,
EndorserAlertSearchResponse,
PartnerAlertSearchResponse,
};
export type AlertSearchServer = "endorser" | "partner";
/** The data each server returns, with the partner similar lists always present. */
export interface AlertSearchServerData {
endorser: EndorserAlertSearchData;
partner: Required<PartnerAlertSearchData>;
}
/** One alertSearch page, or the merge of several pages in one direction. */
export interface AlertSearchResult<S extends AlertSearchServer> {
data: AlertSearchServerData[S];
nextAfterCursor?: AlertSearchCursor;
nextBeforeCursor?: AlertSearchCursor;
/** A list was cut at its limit (after the last page fetched, for a merge). */
hasMore: boolean;
userMessage?: string;
}
export function emptyAlertSearchData<S extends AlertSearchServer>(
server: S,
): AlertSearchServerData[S] {
return (server === "endorser"
? {
claims: [],
personalPlanContributions: [],
trackedPlanUpdates: [],
trackedPlanClaims: [],
plansNearby: [],
}
: {
profilesNearby: [],
profilesSimilar: [],
plansSimilar: [],
}) as unknown as AlertSearchServerData[S];
}
/**
* The search box the person saved, in alertSearch's shape. alertSearch and the
* notification service both take min/max latitude and longitude.
*/
export function alertSearchLocationFromBox(
bbox: BoundingBox | undefined,
): AlertSearchLocationBBox | undefined {
if (!bbox) return undefined;
return {
minLocLat: bbox.minLat,
maxLocLat: bbox.maxLat,
minLocLon: bbox.westLong,
maxLocLon: bbox.eastLong,
};
}
/**
* Fetch one alertSearch page. POST, so the starred handle IDs and the area
* travel in the body.
*/
export async function fetchAlertSearchPage<S extends AlertSearchServer>(
axios: Axios,
server: S,
baseUrl: string,
activeDid: string,
params: AlertSearchRequestParams,
): Promise<AlertSearchResult<S>> {
const path =
server === "endorser"
? ENDORSER_ALERT_SEARCH_PATH
: PARTNER_ALERT_SEARCH_PATH;
const headers = await getHeaders(activeDid);
const response = await axios.post(baseUrl + path, params, { headers });
const body = response.data as
| EndorserAlertSearchResponse
| PartnerAlertSearchResponse;
const data = { ...emptyAlertSearchData(server), ...(body.data || {}) };
return {
data: data as AlertSearchServerData[S],
nextAfterCursor: body.nextAfterCursor,
nextBeforeCursor: body.nextBeforeCursor,
hasMore: body.hasMore === true,
userMessage: body.userMessage,
};
}
/** A key that identifies one row of any alertSearch list, for merging pages. */
function alertSearchRowKey(row: unknown): string | undefined {
if (row === null || typeof row !== "object") return undefined;
const record = row as Record<string, unknown>;
const inner = (record.profile ?? record.plan) as
| Record<string, unknown>
| undefined;
const source = inner && typeof inner === "object" ? inner : record;
for (const key of ["id", "jwtId", "rowId", "handleId", "issuerDid"]) {
const value = source[key];
if (typeof value === "string" || typeof value === "number") {
return key + ":" + value;
}
}
return undefined;
}
/** Concatenate each list of two pages, dropping repeated rows. */
export function mergeAlertSearchData<T extends object>(acc: T, page: T): T {
const merged: Record<string, unknown[]> = {};
for (const key of Object.keys(acc) as Array<keyof T & string>) {
const seen = new Set<string>();
const out: unknown[] = [];
const accList = (acc[key] as unknown[]) || [];
const pageList =
((page as Record<string, unknown>)[key] as unknown[]) || [];
for (const row of [...accList, ...pageList]) {
const rowKey = alertSearchRowKey(row);
if (rowKey !== undefined) {
if (seen.has(rowKey)) continue;
seen.add(rowKey);
}
out.push(row);
}
merged[key] = out;
}
return merged as T;
}
/**
* Page forward from `afterCursor` while `hasMore`, up to `maxPages`, and merge.
* Without `afterCursor` (and no other bound) one page is the whole result: the
* server returns its most recent rows.
*
* @returns the merge; `hasMore` is true when it stopped at `maxPages` with more
* to read, and `nextAfterCursor` is where the merge ends
*/
export async function collectAlertSearchForward<S extends AlertSearchServer>(
fetchPage: (
params: AlertSearchRequestParams,
) => Promise<AlertSearchResult<S>>,
server: S,
params: AlertSearchRequestParams,
maxPages: number,
): Promise<AlertSearchResult<S>> {
let result: AlertSearchResult<S> = {
data: emptyAlertSearchData(server),
hasMore: false,
};
let pageParams = params;
const messages: string[] = [];
for (let page = 0; page < maxPages; page++) {
const pageResult = await fetchPage(pageParams);
if (pageResult.userMessage) messages.push(pageResult.userMessage);
result = {
data: mergeAlertSearchData(result.data, pageResult.data),
nextAfterCursor: pageResult.nextAfterCursor,
nextBeforeCursor: result.nextBeforeCursor ?? pageResult.nextBeforeCursor,
hasMore: pageResult.hasMore,
};
if (
!pageResult.hasMore ||
!params.afterCursor ||
!pageResult.nextAfterCursor ||
pageResult.nextAfterCursor === pageParams.afterCursor
) {
break;
}
pageParams = { ...params, afterCursor: pageResult.nextAfterCursor };
}
if (messages.length > 0) result.userMessage = messages.join(" ");
return result;
}
+1 -1
View File
@@ -127,7 +127,7 @@ export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper<GenericVerifiableCr
// This is used to check for hidden info.
// See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
const HIDDEN_DID = "did:none:HIDDEN";
export const HIDDEN_DID = "did:none:HIDDEN";
/**
* Validates if a string is a valid DID
+391
View File
@@ -0,0 +1,391 @@
/**
* New Activity: the alertSearch buckets, and the cursors that say what the
* person has seen.
*
* Read state has two layers, stored together as JSON in the settings column
* `newActivityCursors`:
* - The visit window, one cursor per server. The summary counts every bucket
* from its start, the same point the notification service counts from once
* the visit is uploaded to it.
* - A window per bucket, on that bucket's server. A detail page counts from the
* end of its last load, so opening it marks the bucket read.
*
* A visit started less than {@link SAME_VISIT_MS} ago is the same visit: the
* next summary load counts from the same start, so reloading the summary does
* not zero the counts. A bucket opened since that start counts from the end of
* its own list instead ({@link summaryStart}).
*/
import type { AlertSearchCursor } from "@/interfaces/alertSearch";
import type {
AlertSearchRequestParams,
AlertSearchServer,
AlertSearchServerData,
} from "./alertSearch";
export const NEW_ACTIVITY_BUCKETS = [
"claims",
"personalPlanContributions",
"trackedPlanUpdates",
"trackedPlanClaims",
"plansNearby",
"profilesNearby",
"profilesSimilar",
"plansSimilar",
] as const;
export type NewActivityBucket = (typeof NEW_ACTIVITY_BUCKETS)[number];
/** What a bucket needs before it can hold anything. */
export type NewActivityPrerequisite = "none" | "starred" | "location";
export interface NewActivityBucketInfo {
key: NewActivityBucket;
server: AlertSearchServer;
/** Heading on the summary and the detail page; `n` is the count. */
label: (n: number) => string;
/** One sentence for the detail page. */
description: string;
needs: NewActivityPrerequisite;
}
function plural(n: number, one: string, many: string): string {
return n === 1 ? one : many;
}
export const NEW_ACTIVITY_BUCKET_INFO: Record<
NewActivityBucket,
NewActivityBucketInfo
> = {
claims: {
key: "claims",
server: "endorser",
label: (n) => plural(n, "Claim About You", "Claims About You"),
description:
"Offers, gifts, and other claims by others that name you as giver or recipient.",
needs: "none",
},
personalPlanContributions: {
key: "personalPlanContributions",
server: "endorser",
label: (n) =>
plural(
n,
"Gift or Offer on Your Projects",
"Gifts & Offers on Your Projects",
),
description:
"Gifts and offers to or from projects you created or are agent for.",
needs: "none",
},
trackedPlanUpdates: {
key: "trackedPlanUpdates",
server: "endorser",
label: (n) =>
plural(
n,
"Starred Project With Changes",
"Starred Projects With Changes",
),
description: "Edits to projects you starred.",
needs: "starred",
},
trackedPlanClaims: {
key: "trackedPlanClaims",
server: "endorser",
label: (n) =>
plural(
n,
"Gift or Offer on Starred Projects",
"Gifts & Offers on Starred Projects",
),
description: "Gifts and offers to or from projects you starred.",
needs: "starred",
},
plansNearby: {
key: "plansNearby",
server: "endorser",
label: (n) => plural(n, "Project Nearby", "Projects Nearby"),
description: "Projects created or edited in your search area.",
needs: "location",
},
profilesNearby: {
key: "profilesNearby",
server: "partner",
label: (n) => plural(n, "Profile Nearby", "Profiles Nearby"),
description: "Profiles created or edited in your search area.",
needs: "location",
},
profilesSimilar: {
key: "profilesSimilar",
server: "partner",
label: (n) => plural(n, "Profile Like Yours", "Profiles Like Yours"),
description:
"Profiles whose description is close in meaning to yours, best match first.",
needs: "none",
},
plansSimilar: {
key: "plansSimilar",
server: "partner",
label: (n) =>
plural(
n,
"Project Matching Your Profile",
"Projects Matching Your Profile",
),
description:
"Projects whose description is close in meaning to your profile, best match first.",
needs: "none",
},
};
export function isNewActivityBucket(
value: unknown,
): value is NewActivityBucket {
return (
typeof value === "string" &&
(NEW_ACTIVITY_BUCKETS as readonly string[]).includes(value)
);
}
/** The rows of one bucket in a server's alertSearch data. */
export function bucketRows<S extends AlertSearchServer>(
data: AlertSearchServerData[S],
bucket: NewActivityBucket,
): unknown[] {
return ((data as unknown as Record<string, unknown[]>)[bucket] ||
[]) as unknown[];
}
export interface CursorPair {
endorser: AlertSearchCursor;
partner: AlertSearchCursor;
}
/**
* The span one load counted: from `from` (absent before any cursor was known)
* up to `to`, the cursor the server returned. `at` is when the visit began;
* `seenAt` is when `to` was recorded, and `fromSeenAt` when `from` was.
*/
export interface ActivityWindow<T> {
from?: T;
to: T;
at: string;
seenAt?: string;
fromSeenAt?: string;
}
export type NotificationChannel = "fcm" | "sms";
export interface NewActivityCursorState {
visit?: ActivityWindow<CursorPair>;
buckets?: Partial<
Record<NewActivityBucket, ActivityWindow<AlertSearchCursor>>
>;
/** The cursors last sent to the notification service, per channel. */
uploaded?: Partial<Record<NotificationChannel, CursorPair>>;
}
/** How long a visit lasts: loads inside it count from the same start. */
export const SAME_VISIT_MS = 30 * 60 * 1000;
/** The stored JSON, or an empty state when it is missing or unreadable. */
export function parseNewActivityCursorState(
text: string | undefined | null,
): NewActivityCursorState {
if (!text) return {};
try {
const parsed = JSON.parse(text);
return parsed && typeof parsed === "object" ? parsed : {};
} catch {
return {};
}
}
export function serializeNewActivityCursorState(
state: NewActivityCursorState,
): string {
return JSON.stringify(state);
}
function isSameVisit<T>(
window: ActivityWindow<T> | undefined,
now: Date,
): boolean {
if (!window) return false;
const started = Date.parse(window.at);
return !Number.isNaN(started) && now.getTime() - started < SAME_VISIT_MS;
}
/** Where a load counts from: the same start inside a visit, else the last end. */
export function windowStart<T>(
window: ActivityWindow<T> | undefined,
now: Date,
): T | undefined {
return isSameVisit(window, now) ? window?.from : window?.to;
}
/** The window to store after a load that counted from `windowStart` up to `to`. */
export function nextWindow<T>(
window: ActivityWindow<T> | undefined,
to: T,
now: Date,
): ActivityWindow<T> {
if (window && isSameVisit(window, now)) {
return {
...(window.from !== undefined ? { from: window.from } : {}),
...(window.fromSeenAt ? { fromSeenAt: window.fromSeenAt } : {}),
to,
at: window.at,
seenAt: now.toISOString(),
};
}
return {
...(window?.to !== undefined
? { from: window.to, fromSeenAt: window.seenAt ?? window.at }
: {}),
to,
at: now.toISOString(),
seenAt: now.toISOString(),
};
}
function seenTime<T>(window: ActivityWindow<T> | undefined): number {
const time = Date.parse(window?.seenAt ?? window?.at ?? "");
return Number.isNaN(time) ? 0 : time;
}
/** When the cursor that {@link windowStart} returns was recorded. */
function startTime<T>(
window: ActivityWindow<T> | undefined,
now: Date,
): number {
if (!isSameVisit(window, now)) return seenTime(window);
const time = Date.parse(window?.fromSeenAt ?? window?.at ?? "");
return Number.isNaN(time) ? 0 : time;
}
/**
* Where the summary counts a bucket from: the visit's start (or `fallback`,
* the notification link's cursors, when the visit has none), unless this
* bucket's list was opened after that start was recorded, in which case the
* end of that list. Opening a list therefore drops its count on the summary
* while the other buckets keep theirs for the rest of the visit.
*/
export function summaryStart(
state: NewActivityCursorState,
bucket: NewActivityBucket,
now: Date,
fallback?: CursorPair,
): AlertSearchCursor | undefined {
const server = NEW_ACTIVITY_BUCKET_INFO[bucket].server;
const visitStart =
windowStart(state.visit, now)?.[server] ?? fallback?.[server];
const bucketWindow = state.buckets?.[bucket];
if (!bucketWindow) return visitStart;
if (visitStart === undefined) return bucketWindow.to;
return seenTime(bucketWindow) > startTime(state.visit, now)
? bucketWindow.to
: visitStart;
}
/**
* Where the Home screen counts a bucket from: the end of whichever load the
* person saw last, the summary's or this bucket's own list. Unlike
* {@link windowStart} it never reaches back to the start of a visit, so a list
* just opened shows nothing new on Home.
*/
export function unseenStart(
state: NewActivityCursorState,
bucket: NewActivityBucket,
): AlertSearchCursor | undefined {
const visitTo = state.visit?.to[NEW_ACTIVITY_BUCKET_INFO[bucket].server];
const bucketWindow = state.buckets?.[bucket];
if (!bucketWindow) return visitTo;
if (visitTo === undefined) return bucketWindow.to;
return seenTime(bucketWindow) >= seenTime(state.visit)
? bucketWindow.to
: visitTo;
}
/**
* The `c` query value in notification links: the endorser and partner cursors
* joined by ".", which appears in neither server's cursor format.
*/
export function joinCursorPair(pair: CursorPair): string {
return pair.endorser + "." + pair.partner;
}
export function parseCursorParam(
value: string | undefined | null,
): CursorPair | undefined {
if (!value) return undefined;
const dot = value.indexOf(".");
if (dot <= 0 || dot === value.length - 1) return undefined;
return { endorser: value.slice(0, dot), partner: value.slice(dot + 1) };
}
export function sameCursorPair(
a: CursorPair | undefined,
b: CursorPair | undefined,
): boolean {
return (
a !== undefined &&
b !== undefined &&
a.endorser === b.endorser &&
a.partner === b.partner
);
}
/**
* Request params for a load that starts at `cursor`. Without one, the request
* carries no cursor or ID, and the server answers with its most recent rows
* and its latest cursors.
*/
export function startParams(
cursor: AlertSearchCursor | undefined,
): AlertSearchRequestParams {
return cursor ? { afterCursor: cursor } : {};
}
/**
* The state with a visit ending at `latest`, as if the person had looked at
* everything up to it: nothing before it counts as new. The visit's start is
* long past, so the next load counts from `latest`.
*/
export function seededState(
state: NewActivityCursorState,
latest: CursorPair,
now: Date,
): NewActivityCursorState {
return {
...state,
visit: {
to: latest,
at: new Date(0).toISOString(),
seenAt: now.toISOString(),
},
};
}
const CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
/**
* The ULID immediately before `id` in sort order, so that `afterId` set to it
* includes `id` itself. Undefined for a value that is not a ULID or is all
* zeros.
*/
export function ulidJustBefore(id: string): string | undefined {
const upper = id.toUpperCase();
if (!/^[0-9A-HJKMNP-TV-Z]{26}$/.test(upper)) return undefined;
const chars = upper.split("");
for (let i = chars.length - 1; i >= 0; i--) {
const index = CROCKFORD.indexOf(chars[i]);
if (index > 0) {
chars[i] = CROCKFORD[index - 1];
return chars.join("");
}
chars[i] = CROCKFORD[CROCKFORD.length - 1];
}
return undefined;
}
+113 -4
View File
@@ -266,6 +266,87 @@ export interface ConfirmerData {
numConfsNotVisible: number;
}
export interface ConfirmationRecord {
issuer: string; // may be HIDDEN
issuedAt?: string; // missing from servers without confirmationsForClaim
jwtId?: string; // the confirmation's own claim; missing like issuedAt
}
export interface ConfirmationsData {
confirmations: ConfirmationRecord[]; // excluding the claim issuer, newest first
confsVisibleToIdList: string[]; // list of DIDs that can see any hidden confirmer
hitLimit: boolean; // there may be more before the last of these confirmations
requesterConfirmed: boolean; // even if that confirmation is not in this page
totalCount: number; // across all pages
}
/**
* @param claimJwtId the JWT ID of the claim, not a handle
* @param beforeId the jwtId of the last confirmation already retrieved, for the next page
* @return the confirmations of the claim, newest first, excluding the issuer
*/
export async function retrieveConfirmations(
apiServer: string,
claimJwtId: string,
claimIssuerId: string,
userDid: string,
beforeId?: string,
): Promise<ConfirmationsData | undefined> {
const url =
apiServer +
"/api/v2/report/confirmationsForClaim?claimId=" +
encodeURIComponent(serverUtil.stripEndorserPrefix(claimJwtId)) +
(beforeId ? "&beforeId=" + encodeURIComponent(beforeId) : "");
const headers = await serverUtil.getHeaders(userDid);
try {
const response = await axios.get(url, { headers });
const records: Array<
ConfirmationRecord & { issuerVisibleToDids?: string[] }
> = response.data.data || [];
return {
confirmations: records.map((record) => ({
issuer: record.issuer,
issuedAt: record.issuedAt,
jwtId: record.jwtId,
})),
confsVisibleToIdList: R.uniq(
records.flatMap((record) => record.issuerVisibleToDids || []),
),
hitLimit: !!response.data.hitLimit,
requesterConfirmed: !!response.data.requesterConfirmed,
totalCount: response.data.totalCount ?? records.length,
};
} catch (error) {
if (!axios.isAxiosError(error) || error.response?.status !== 404) {
throw error;
}
// This server predates confirmationsForClaim, so get all the confirmers without dates.
const confirmerInfo = await retrieveConfirmerIdList(
apiServer,
claimJwtId,
claimIssuerId,
userDid,
);
if (!confirmerInfo) {
return undefined;
}
const confirmations = [
...confirmerInfo.confirmerIdList.map((issuer) => ({ issuer })),
...R.repeat(
{ issuer: serverUtil.HIDDEN_DID },
Math.max(confirmerInfo.numConfsNotVisible, 0),
),
];
return {
confirmations,
confsVisibleToIdList: confirmerInfo.confsVisibleToIdList,
hitLimit: false,
requesterConfirmed: confirmerInfo.confirmerIdList.includes(userDid),
totalCount: confirmations.length,
};
}
}
// // This is meant to be a second argument to JSON.stringify to avoid circular references.
// // Usage: JSON.stringify(error, getCircularReplacer())
// // Beware: we've seen this return "undefined" when there is actually a message, eg: DatabaseClosedError: Error DEXIE ENCRYPT ADDON: Encryption key has changed
@@ -336,10 +417,36 @@ export async function retrieveConfirmerIdList(
}
}
// Confirming these makes no sense: a confirmation of a confirmation, or of a reaction.
const UNCONFIRMABLE_CLAIM_TYPES = ["AgreeAction", "Emoji"];
export const isConfirmableClaimType = (claimType?: string) => {
return !UNCONFIRMABLE_CLAIM_TYPES.includes(claimType || "");
};
/**
* @returns true if the user can confirm the claim
* @param veriClaim is expected to have fields: claim, claimType, and issuer
*/
export function isClaimTheUserCanConfirm(
isRegistered: boolean,
veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
activeDid: string,
confirmerIdList: string[] = [],
): boolean {
return (
isRegistered &&
isConfirmableClaimType(veriClaim.claimType) &&
!confirmerIdList.includes(activeDid) &&
veriClaim.issuer !== activeDid &&
!containsHiddenDid(veriClaim.claim)
);
}
/**
* @returns true if the claim is a give and the user can confirm it
* @param veriClaim is expected to have fields: claim, claimType, and issuer
*/
export function isGiveRecordTheUserCanConfirm(
isRegistered: boolean,
veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
@@ -347,11 +454,13 @@ export function isGiveRecordTheUserCanConfirm(
confirmerIdList: string[] = [],
): boolean {
return (
isRegistered &&
isGiveAction(veriClaim) &&
!confirmerIdList.includes(activeDid) &&
veriClaim.issuer !== activeDid &&
!containsHiddenDid(veriClaim.claim)
isClaimTheUserCanConfirm(
isRegistered,
veriClaim,
activeDid,
confirmerIdList,
)
);
}
+52
View File
@@ -0,0 +1,52 @@
/**
* Web Share Target handoff (web build only).
*
* public/sw.js receives the POST from the manifest's share_target, stores the
* photo in Cache Storage under these keys, and redirects to /shared-photo.
* Keep the constants in sync with public/sw.js.
*/
import { logger } from "../utils/logger";
const SHARE_TARGET_CACHE = "share-target";
const SHARED_PHOTO_KEY = "/share-target/photo";
const FILE_NAME_HEADER = "X-File-Name";
export interface WebSharedPhoto {
blob: Blob;
fileName: string;
}
/**
* Registers public/sw.js, which handles the share target POST.
*/
export function registerWebShareTargetWorker(): void {
if (!("serviceWorker" in navigator)) {
return;
}
navigator.serviceWorker.register("/sw.js").catch((error) => {
// Not fatal: only sharing into the app depends on the worker.
logger.warn("[WebShareTarget] Service worker registration failed", error);
});
}
/**
* Returns the photo stashed by the service worker and removes it, or null
* when there is none (or Cache Storage is unavailable).
*/
export async function takeWebSharedPhoto(): Promise<WebSharedPhoto | null> {
if (typeof caches === "undefined") {
return null;
}
const cache = await caches.open(SHARE_TARGET_CACHE);
const response = await cache.match(SHARED_PHOTO_KEY);
if (!response) {
return null;
}
const blob = await response.blob();
const fileName = decodeURIComponent(
response.headers.get(FILE_NAME_HEADER) || "",
);
await cache.delete(SHARED_PHOTO_KEY);
return { blob, fileName };
}
+51 -14
View File
@@ -1,20 +1,57 @@
import { initializeApp } from "./main.common";
import { logger } from "./utils/logger";
import { registerWebShareTargetWorker } from "./libs/webShareTarget";
const platform = process.env.VITE_PLATFORM;
// PWA service worker is automatically registered by VitePWA plugin
const app = initializeApp();
// Note: Worker initialization is now handled by WebPlatformService
// This ensures single-point database access and prevents double migrations
if (platform === "web" || platform === "development") {
logger.debug(
"[Web] Database initialization will be handled by WebPlatformService",
);
} else {
logger.debug("[Web] SQL not initialized for platform", { platform });
/**
* Browsers withhold crypto.subtle outside secure contexts (HTTPS, localhost,
* 127.0.0.1, [::1]), and identity creation cannot run without it. Addresses
* like http://[::]:8000 or http://192.168.x.x would otherwise fail later with
* a misleading "could not open its data" startup error. main.common is loaded
* only after this check because importing the router starts navigation.
*/
function showInsecureContextError(): void {
const container = document.getElementById("app");
if (!container) {
return;
}
container.innerHTML = `
<section style="max-width: 40rem; margin: 3rem auto; padding: 0 1rem; font-family: sans-serif; line-height: 1.5;">
<h1 style="font-size: 1.25rem; font-weight: 600;">Time Safari Cannot Start Here</h1>
<p>This page must be opened over HTTPS or from <code>localhost</code>.</p>
<p>The browser does not treat <code></code> as secure, so it disables the cryptography the app uses for identities.</p>
<p>On a local server, use <code>http://localhost:PORT/</code> instead of <code>http://[::]:PORT/</code> or <code>http://0.0.0.0:PORT/</code>.</p>
</section>`;
const originCode = container.querySelectorAll("code")[1];
if (originCode) {
originCode.textContent = window.location.origin;
}
}
app.mount("#app");
if (!window.isSecureContext) {
logger.error("[Web] Not a secure context; app will not start", {
origin: window.location.origin,
});
showInsecureContextError();
} else {
import("./main.common").then(({ initializeApp }) => {
const app = initializeApp();
// Note: Worker initialization is now handled by WebPlatformService
// This ensures single-point database access and prevents double migrations
if (platform === "web" || platform === "development") {
logger.debug(
"[Web] Database initialization will be handled by WebPlatformService",
);
} else {
logger.debug("[Web] SQL not initialized for platform", { platform });
}
app.mount("#app");
// Handles the manifest's share_target POST (see public/sw.js)
if (platform === "web") {
registerWebShareTargetWorker();
}
});
}
+1 -1
View File
@@ -11,7 +11,7 @@ export type PendingNotificationInfo = {
export interface NotificationInspectorPlugin {
getPendingNotifications(): Promise<{ pending: PendingNotificationInfo[] }>;
/** Android only: whether the build has a Firebase config (-PfirebaseEnabled). */
/** Android only: whether this build included Firebase (off only with -PfirebaseEnabled=false). */
isFirebaseConfigured(): Promise<{ configured: boolean }>;
}
+7 -3
View File
@@ -37,9 +37,10 @@ const routes: Array<RouteRecordRaw> = [
component: () => import("../views/ClaimCertificateView.vue"),
},
{
// shared links to the former gift-confirmation page; the claim page has the same details
path: "/confirm-gift/:id?",
name: "confirm-gift",
component: () => import("../views/ConfirmGiftView.vue"),
redirect: (to) => ({ name: "claim", params: { id: to.params.id } }),
},
{
path: "/contact-amounts",
@@ -190,6 +191,11 @@ const routes: Array<RouteRecordRaw> = [
name: "new-activity",
component: () => import("../views/NewActivityView.vue"),
},
{
path: "/new-activity/:bucket",
name: "new-activity-bucket",
component: () => import("../views/NewActivityBucketView.vue"),
},
{
path: "/new-edit-account",
name: "new-edit-account",
@@ -281,8 +287,6 @@ const routes: Array<RouteRecordRaw> = [
component: () => import("../views/SharedPhotoView.vue"),
},
// /share-target is also an endpoint in the service worker
{
path: "/start",
name: "start",
-10
View File
@@ -225,14 +225,4 @@ export interface PlatformService {
* @throws if the backup copy fails (the original is never deleted without one)
*/
resetDatabase?(): Promise<string | undefined>;
// --- PWA/Web-only methods (optional, only implemented on web) ---
/**
* Registers the service worker for PWA support (web only)
*/
registerServiceWorker?(): void;
/**
* Returns true if PWA is enabled (web only)
*/
}
+447
View File
@@ -0,0 +1,447 @@
/**
* Loads for the New Activity summary and detail pages, and the upload that
* keeps the notification service counting from the same point.
*
* The cursors and windows are described in `@/libs/newActivity`.
*/
import type { Axios } from "axios";
import type { AlertSearchCursor } from "@/interfaces/alertSearch";
import type { AlertSearchUploadState } from "@/interfaces/notifyApi";
import {
type AlertSearchLocationBBox,
type AlertSearchRequestParams,
type AlertSearchResult,
type AlertSearchServer,
collectAlertSearchForward,
fetchAlertSearchPage,
} from "@/libs/alertSearch";
import {
bucketRows,
type CursorPair,
NEW_ACTIVITY_BUCKETS,
NEW_ACTIVITY_BUCKET_INFO,
type NewActivityBucket,
type NewActivityCursorState,
seededState,
startParams,
summaryStart,
unseenStart,
windowStart,
} from "@/libs/newActivity";
/** Pages read per server for the summary counts; past that a count shows "+". */
export const SUMMARY_MAX_PAGES = 4;
/** Pages read for a detail page before offering "Show more". */
export const DETAIL_MAX_PAGES = 10;
/** Pages to step back through looking for one of this bucket's rows. */
export const EARLIER_MAX_PAGES = 5;
export interface NewActivityContext {
axios: Axios;
endorserServer: string;
partnerServer: string;
activeDid: string;
/** Starred projects; the tracked buckets are empty without them. */
planHandleIds: string[];
/** The saved search area; the nearby buckets are empty without it. */
location?: AlertSearchLocationBBox;
}
/** Whether a bucket can hold anything with this context's inputs. */
export function bucketIsAvailable(
ctx: Pick<NewActivityContext, "planHandleIds" | "location">,
bucket: NewActivityBucket,
): boolean {
const needs = NEW_ACTIVITY_BUCKET_INFO[bucket].needs;
if (needs === "starred") return ctx.planHandleIds.length > 0;
if (needs === "location") return ctx.location !== undefined;
return true;
}
function serverBaseUrl(ctx: NewActivityContext, server: AlertSearchServer) {
return server === "endorser" ? ctx.endorserServer : ctx.partnerServer;
}
/** The inputs every request to a server carries, besides its bounds. */
function serverInputs(
ctx: NewActivityContext,
server: AlertSearchServer,
): AlertSearchRequestParams {
const inputs: AlertSearchRequestParams = {};
if (ctx.location) inputs.location = ctx.location;
if (server === "endorser" && ctx.planHandleIds.length > 0) {
inputs.planHandleIds = ctx.planHandleIds;
}
return inputs;
}
function pageFetcher<S extends AlertSearchServer>(
ctx: NewActivityContext,
server: S,
) {
return (params: AlertSearchRequestParams) =>
fetchAlertSearchPage(
ctx.axios,
server,
serverBaseUrl(ctx, server),
ctx.activeDid,
{ ...serverInputs(ctx, server), ...params },
);
}
export interface ServerCounts {
/** Undefined for a bucket whose inputs are missing. */
counts: Partial<Record<NewActivityBucket, number>>;
/** A count is a lower bound: the read stopped with more to go. */
hitLimit: boolean;
/** Per bucket, when this server's buckets were read from different starts. */
bucketHitLimit?: Partial<Record<NewActivityBucket, boolean>>;
/** Where this read ended: the start of the next visit. */
to?: AlertSearchCursor;
userMessage?: string;
error?: string;
}
export interface NewActivityCounts {
endorser: ServerCounts;
partner: ServerCounts;
}
function errorText(error: unknown): string {
if (error && typeof error === "object") {
const response = (error as { response?: { data?: { error?: unknown } } })
.response;
const serverError = response?.data?.error;
if (typeof serverError === "string") return serverError;
if (serverError && typeof serverError === "object") {
const message = (serverError as { message?: unknown }).message;
if (typeof message === "string") return message;
}
const message = (error as { message?: unknown }).message;
if (typeof message === "string") return message;
}
return "The request failed.";
}
async function countServer(
ctx: NewActivityContext,
server: AlertSearchServer,
from: AlertSearchCursor | undefined,
): Promise<ServerCounts> {
try {
const result = await collectAlertSearchForward(
pageFetcher(ctx, server),
server,
startParams(from),
SUMMARY_MAX_PAGES,
);
const counts: Partial<Record<NewActivityBucket, number>> = {};
for (const bucket of NEW_ACTIVITY_BUCKETS) {
if (
NEW_ACTIVITY_BUCKET_INFO[bucket].server === server &&
bucketIsAvailable(ctx, bucket)
) {
// with no start, the rows are the server's latest, not new ones
counts[bucket] =
from === undefined ? 0 : bucketRows(result.data, bucket).length;
}
}
return {
counts,
hitLimit: from !== undefined && result.hasMore,
to: result.nextAfterCursor,
userMessage: result.userMessage,
};
} catch (error) {
return { counts: {}, hitLimit: false, error: errorText(error) };
}
}
/** Counts for every bucket since `from` (each server independently). */
export async function countNewActivity(
ctx: NewActivityContext,
from: Partial<CursorPair> | undefined,
): Promise<NewActivityCounts> {
const [endorser, partner] = await Promise.all([
countServer(ctx, "endorser", from?.endorser),
countServer(ctx, "partner", from?.partner),
]);
return { endorser, partner };
}
export interface BucketCount {
count: number;
/** The count is a lower bound: the read stopped with more to go. */
hitLimit: boolean;
}
export interface UnseenCounts {
/** Undefined for a bucket whose inputs are missing or whose server failed. */
buckets: Partial<Record<NewActivityBucket, BucketCount>>;
errors: string[];
}
interface StartGroup {
server: AlertSearchServer;
from?: AlertSearchCursor;
buckets: NewActivityBucket[];
result: ServerCounts;
}
/**
* Counts for each available bucket from its own start. Buckets on the same
* server with the same start share one read.
*/
async function countFromStarts(
ctx: NewActivityContext,
startOf: (bucket: NewActivityBucket) => AlertSearchCursor | undefined,
): Promise<StartGroup[]> {
const groups = new Map<string, Omit<StartGroup, "result">>();
for (const bucket of NEW_ACTIVITY_BUCKETS) {
if (!bucketIsAvailable(ctx, bucket)) continue;
const server = NEW_ACTIVITY_BUCKET_INFO[bucket].server;
const from = startOf(bucket);
const key = server + " " + (from ?? "");
const group = groups.get(key) ?? { server, from, buckets: [] };
group.buckets.push(bucket);
groups.set(key, group);
}
return Promise.all(
[...groups.values()].map(async (group) => ({
...group,
result: await countServer(ctx, group.server, group.from),
})),
);
}
/**
* Counts for the summary: each bucket from {@link summaryStart}. Each server's
* `to`, the end of the visit, comes from the read that started at the visit's
* start, so a capped read leaves the rest for the next visit; when every
* bucket on the server has its own start, from a read that was not capped.
* A server with any failed read reports the error and no `to`.
*/
export async function countSummaryActivity(
ctx: NewActivityContext,
state: NewActivityCursorState,
now: Date,
fallback?: CursorPair,
): Promise<NewActivityCounts> {
const groups = await countFromStarts(ctx, (bucket) =>
summaryStart(state, bucket, now, fallback),
);
const visitStart = windowStart(state.visit, now) ?? fallback;
const serverCounts = (server: AlertSearchServer): ServerCounts => {
const own = groups.filter((group) => group.server === server);
const counts: ServerCounts = {
counts: {},
hitLimit: false,
bucketHitLimit: {},
};
for (const group of own) {
const result = group.result;
if (result.error) {
counts.error ??= result.error;
continue;
}
counts.userMessage ??= result.userMessage;
counts.hitLimit ||= result.hitLimit;
for (const bucket of group.buckets) {
counts.counts[bucket] = result.counts[bucket];
counts.bucketHitLimit![bucket] = result.hitLimit;
}
}
if (!counts.error) {
const ending =
own.find((group) => group.from === visitStart?.[server]) ??
own.find((group) => !group.result.hitLimit) ??
own[0];
counts.to = ending?.result.to;
}
return counts;
};
return {
endorser: serverCounts("endorser"),
partner: serverCounts("partner"),
};
}
/**
* Counts for the Home screen: each bucket from {@link unseenStart}. A person
* who has opened no list since the summary costs one read per server.
*/
export async function countUnseenActivity(
ctx: NewActivityContext,
state: NewActivityCursorState,
): Promise<UnseenCounts> {
const counted = await countFromStarts(ctx, (bucket) =>
unseenStart(state, bucket),
);
const unseen: UnseenCounts = { buckets: {}, errors: [] };
for (const { buckets, result } of counted) {
if (result.error) {
if (!unseen.errors.includes(result.error)) {
unseen.errors.push(result.error);
}
continue;
}
for (const bucket of buckets) {
unseen.buckets[bucket] = {
count: result.counts[bucket] ?? 0,
hitLimit: result.hitLimit,
};
}
}
return unseen;
}
/** The sum of the known counts, as the notification service totals them. */
export function totalNewActivity(counts: NewActivityCounts): number {
let total = 0;
for (const server of ["endorser", "partner"] as const) {
for (const value of Object.values(counts[server].counts)) {
total += value ?? 0;
}
}
return total;
}
/** The pair to store as the end of this visit, when both servers answered. */
export function countsEndPair(
counts: NewActivityCounts,
): CursorPair | undefined {
return counts.endorser.to && counts.partner.to
? { endorser: counts.endorser.to, partner: counts.partner.to }
: undefined;
}
export interface BucketPage {
rows: unknown[];
/** Forward: the cursor to store, where this read ended. */
nextAfterCursor?: AlertSearchCursor;
/** Backward: where to continue for earlier rows. */
nextBeforeCursor?: AlertSearchCursor;
hasMore: boolean;
userMessage?: string;
}
/** Every row of one bucket from `from` forward, up to DETAIL_MAX_PAGES. */
export async function loadBucket(
ctx: NewActivityContext,
bucket: NewActivityBucket,
from: AlertSearchCursor | undefined,
): Promise<BucketPage> {
const server = NEW_ACTIVITY_BUCKET_INFO[bucket].server;
const result: AlertSearchResult<AlertSearchServer> =
await collectAlertSearchForward(
pageFetcher(ctx, server),
server,
startParams(from),
DETAIL_MAX_PAGES,
);
// with no start, the rows are the server's latest, not new ones
return {
rows: from === undefined ? [] : bucketRows(result.data, bucket),
nextAfterCursor: result.nextAfterCursor,
nextBeforeCursor: result.nextBeforeCursor,
hasMore: from !== undefined && result.hasMore,
userMessage: result.userMessage,
};
}
/**
* Rows of one bucket before `before`, newest first. Pages are cut across all
* of a server's lists, so a page can hold none of this bucket while more
* remain; this steps back up to EARLIER_MAX_PAGES looking for some.
*/
export async function loadBucketEarlier(
ctx: NewActivityContext,
bucket: NewActivityBucket,
before: AlertSearchCursor,
): Promise<BucketPage> {
const server = NEW_ACTIVITY_BUCKET_INFO[bucket].server;
const fetchPage = pageFetcher(ctx, server);
let cursor = before;
for (let page = 0; page < EARLIER_MAX_PAGES; page++) {
const result = await fetchPage({ beforeCursor: cursor });
const rows = bucketRows(result.data, bucket);
const moved =
!!result.nextBeforeCursor && result.nextBeforeCursor !== cursor;
if (rows.length > 0 || !result.hasMore || !moved) {
return {
rows,
nextBeforeCursor: result.nextBeforeCursor,
hasMore: result.hasMore && moved,
userMessage: result.userMessage,
};
}
cursor = result.nextBeforeCursor as AlertSearchCursor;
}
return { rows: [], nextBeforeCursor: cursor, hasMore: true };
}
/**
* The latest cursors, for a notification upload when notifications are turned
* on: the first daily count then starts from now instead of from old rows.
* Each server answers on its own; one that fails is left out.
*/
export async function latestCursorPair(
ctx: NewActivityContext,
): Promise<Partial<CursorPair>> {
const [endorser, partner] = await Promise.allSettled([
pageFetcher(ctx, "endorser")({}),
pageFetcher(ctx, "partner")({}),
]);
const latest: Partial<CursorPair> = {};
if (endorser.status === "fulfilled" && endorser.value.nextAfterCursor) {
latest.endorser = endorser.value.nextAfterCursor;
}
if (partner.status === "fulfilled" && partner.value.nextAfterCursor) {
latest.partner = partner.value.nextAfterCursor;
}
return latest;
}
/**
* A state with a visit to count from. With none yet (the person has never
* loaded New Activity or Home, nor turned on notifications), this asks each
* server for its latest cursor and returns a visit ending there, so nothing
* before it shows as new. The state is returned unchanged when it has a visit
* or a server did not answer; `seeded` says whether to save it.
*/
export async function seedIfNeeded(
ctx: NewActivityContext,
state: NewActivityCursorState,
now: Date,
): Promise<{ state: NewActivityCursorState; seeded: boolean }> {
if (state.visit) return { state, seeded: false };
const latest = await latestCursorPair(ctx);
if (!latest.endorser || !latest.partner) return { state, seeded: false };
return {
state: seededState(
state,
{ endorser: latest.endorser, partner: latest.partner },
now,
),
seeded: true,
};
}
/**
* The upload body fields for a channel's alert authorization. A server
* without a cursor is left out, and the service keeps (or, with none stored,
* seeds) its own.
*/
export function alertSearchUploadState(
ctx: Pick<NewActivityContext, "planHandleIds" | "location">,
cursors: Partial<CursorPair> | undefined,
): AlertSearchUploadState {
return {
...(cursors?.endorser ? { endorserAfterCursor: cursors.endorser } : {}),
...(cursors?.partner ? { partnerAfterCursor: cursors.partner } : {}),
planHandleIds: ctx.planHandleIds.length > 0 ? ctx.planHandleIds : null,
location: ctx.location ?? null,
};
}
+37
View File
@@ -0,0 +1,37 @@
/**
* Build a {@link NewActivityContext} from the account settings, the same way
* on the summary, the detail pages and the notification toggles.
*/
import type { Axios } from "axios";
import {
DEFAULT_ENDORSER_API_SERVER,
DEFAULT_PARTNER_API_SERVER,
} from "@/constants/app";
import * as databaseUtil from "@/db/databaseUtil";
import type { Settings } from "@/db/tables/settings";
import type { BoundingBox } from "@/interfaces/accountView";
import { alertSearchLocationFromBox } from "@/libs/alertSearch";
import type { NewActivityContext } from "./newActivity";
export function buildNewActivityContext(
axios: Axios,
activeDid: string,
settings: Settings,
): NewActivityContext {
const searchBoxes = databaseUtil.parseJsonField<
Array<{ name: string; bbox: BoundingBox }>
>(settings.searchBoxes, []);
return {
axios,
endorserServer: settings.apiServer || DEFAULT_ENDORSER_API_SERVER,
partnerServer: settings.partnerApiServer || DEFAULT_PARTNER_API_SERVER,
activeDid,
planHandleIds: databaseUtil.parseJsonField<string[]>(
settings.starredPlanHandleIds,
[],
),
location: alertSearchLocationFromBox(searchBoxes[0]?.bbox),
};
}
@@ -12,7 +12,10 @@
* `@/interfaces/notifyApi`.
*/
import type { AlertAuthorizationRequestBody } from "@/interfaces/notifyApi";
import type {
AlertAuthorizationRequestBody,
AlertSearchUploadState,
} from "@/interfaces/notifyApi";
import { ETHR_DID_PREFIX } from "@/libs/crypto/vc";
import {
ALERT_AUTHORIZATION_BATCH_DAYS,
@@ -87,7 +90,8 @@ const defaultDependencies: AlertAuthorizationDependencies = {
function buildRequestBody(
batch: AlertAuthorizationBatch,
timeZone: string,
): AlertAuthorizationRequestBody {
searchState: AlertSearchUploadState = {},
): AlertAuthorizationRequestBody & AlertSearchUploadState {
if (batch.jwts.length !== ALERT_AUTHORIZATION_BATCH_DAYS) {
throw new Error(
`Expected ${ALERT_AUTHORIZATION_BATCH_DAYS} delegated JWTs, received ${batch.jwts.length}.`,
@@ -102,6 +106,7 @@ function buildRequestBody(
notifyMinuteUtc: notifyTime.notifyMinuteUtc,
timezone: timeZone,
jwts: batch.jwts,
...searchState,
};
}
@@ -203,9 +208,13 @@ async function authorizationHttpFailure(response: Response): Promise<{
/**
* Mint and upload a delegated AlertSearch authorization batch.
* This function never retries and refuses notification auth bypass mode.
*
* @param searchState cursors to count from, and the starred handle IDs and
* area the daily search uses; see {@link AlertSearchUploadState}
*/
export async function uploadAlertSearchAuthorization(
dependencies: AlertAuthorizationDependencies = defaultDependencies,
searchState?: AlertSearchUploadState,
): Promise<AlertAuthorizationUploadResult> {
try {
const access = await requireDelegatedAlertAccess(dependencies, "uploaded");
@@ -215,7 +224,7 @@ export async function uploadAlertSearchAuthorization(
const batch = await dependencies.mintBatch(access.did);
const timeZone = dependencies.getTimeZone();
const body = buildRequestBody(batch, timeZone);
const body = buildRequestBody(batch, timeZone, searchState);
const response = await dependencies.fetch(
`${dependencies.getBaseUrl()}/notifications/alert-authorization`,
@@ -69,9 +69,10 @@ async function registerRetrievedToken(
}
/**
* Whether PushNotifications.register() is safe to call. Android builds without
* -PfirebaseEnabled (FOSS/F-Droid/APK) have no Firebase config, and register()
* there throws natively, crashing the app before any JS catch can run.
* Whether PushNotifications.register() is safe to call. Android builds with
* Firebase disabled (-PfirebaseEnabled=false, FOSS/F-Droid) have no Firebase
* config, and register() there throws natively, crashing the app before any
* JS catch can run.
*/
async function canRegisterNativePush(): Promise<boolean> {
if (Capacitor.getPlatform() !== "android") {
@@ -101,7 +102,7 @@ export async function reregisterFcmTokenNow(): Promise<string> {
if (!(await canRegisterNativePush())) {
throw new Error(
"Push is unavailable: this Android build has no Firebase config (built without -PfirebaseEnabled)",
"Push is unavailable: this Android build has no Firebase config (built with -PfirebaseEnabled=false)",
);
}
@@ -258,6 +259,23 @@ async function attachFirebaseMessagingIfSupported(
* Native: register Capacitor push listeners, request permissions, register for push,
* then initialize Firebase Messaging when env config and platform support allow.
*/
/** The FCM data `type` of the daily New Activity notification. */
const ALERT_SEARCH_FCM_TYPE = "alert_search";
/**
* Open New Activity when the daily New Activity notification is tapped,
* passing its start cursors (`c`) so the screen can compare them with its own.
*/
async function openNewActivityForAlertSearch(
data: Record<string, unknown> | undefined,
): Promise<void> {
if (data?.type !== ALERT_SEARCH_FCM_TYPE) return;
// imported here: the router imports views that import this module's callers
const { default: router } = await import("@/router");
const c = typeof data.c === "string" ? data.c : undefined;
await router.push({ name: "new-activity", query: c ? { c } : {} });
}
async function initializeNativePushAndFirebaseMessagingImpl(): Promise<void> {
if (!Capacitor.isNativePlatform()) {
return;
@@ -306,6 +324,11 @@ async function initializeNativePushAndFirebaseMessagingImpl(): Promise<void> {
(action) => {
logger.debug(`${LOG} pushNotificationActionPerformed`, action);
logPushNotificationActionPerformed(action);
void openNewActivityForAlertSearch(action.notification?.data).catch(
(err) => {
logger.warn(`${LOG} Could not open New Activity`, err);
},
);
},
);
@@ -8,6 +8,7 @@
* unchanged instead of showing the subscription as off.
*/
import type { AlertSearchUploadState } from "@/interfaces/notifyApi";
import {
type AlertAuthorizationDependencies,
type AlertAuthorizationRevokeResult,
@@ -23,8 +24,12 @@ import {
export async function authorizeInAppNewActivity(
reportError: (message: string) => void,
dependencies?: AlertAuthorizationDependencies,
searchState?: AlertSearchUploadState,
): Promise<AlertAuthorizationUploadResult> {
const result = await uploadAlertSearchAuthorization(dependencies);
const result = await uploadAlertSearchAuthorization(
dependencies,
searchState,
);
if (!result.ok) {
reportError(result.errorMessage);
}
@@ -0,0 +1,113 @@
/**
* Re-authorize the daily New Activity notifications after the person has looked
* at New Activity, so the next push or text counts only what came after.
*
* Each enabled channel gets a fresh delegated JWT batch (replacing the unused
* one) carrying the visit's end cursors, the starred handle IDs and the search
* area. The service skips days whose JWT was already spent, so this never
* causes a second notification on the same day.
*/
import type { AlertSearchUploadState } from "@/interfaces/notifyApi";
import type { CursorPair, NotificationChannel } from "@/libs/newActivity";
import { logger } from "@/utils/logger";
import { localTimeTextToUtc } from "./alertAuthorizationBatch";
import { uploadAlertSearchAuthorization } from "./alertAuthorization";
import { authorizeSmsAlertSearch } from "./smsNotificationApi";
/** The settings that say which channels are on. */
export interface NotificationChannelSettings {
notifyingNewActivityTime?: string;
notifyingNewActivitySmsTime?: string;
smsNotificationsEnabled?: boolean;
}
export function enabledNotificationChannels(
settings: NotificationChannelSettings,
): NotificationChannel[] {
const channels: NotificationChannel[] = [];
if (settings.notifyingNewActivityTime) channels.push("fcm");
if (
settings.smsNotificationsEnabled &&
settings.notifyingNewActivitySmsTime
) {
channels.push("sms");
}
return channels;
}
export interface NotificationRefreshDependencies {
uploadFcm: (state: AlertSearchUploadState) => Promise<boolean>;
uploadSms: (
did: string,
notifyHourUtc: number,
notifyMinuteUtc: number,
state: AlertSearchUploadState,
) => Promise<boolean>;
}
const defaultDependencies: NotificationRefreshDependencies = {
uploadFcm: async (state) => {
const result = await uploadAlertSearchAuthorization(undefined, state);
if (!result.ok) {
logger.warn(
"[NewActivityRefresh] Push re-authorization failed:",
result.errorMessage,
);
}
return result.ok;
},
uploadSms: async (did, hour, minute, state) => {
await authorizeSmsAlertSearch(did, hour, minute, state);
return true;
},
};
/**
* Upload to each channel in `channels`. Failures are logged, never thrown: the
* screen has already shown its counts, and the old batch keeps working.
*
* @returns the channels that accepted the upload, with the cursors they now hold
*/
export async function refreshNotificationAuthorizations(
did: string,
settings: NotificationChannelSettings,
channels: NotificationChannel[],
cursors: CursorPair,
state: AlertSearchUploadState,
dependencies: NotificationRefreshDependencies = defaultDependencies,
): Promise<Partial<Record<NotificationChannel, CursorPair>>> {
const uploaded: Partial<Record<NotificationChannel, CursorPair>> = {};
for (const channel of channels) {
try {
let ok = false;
if (channel === "fcm") {
ok = await dependencies.uploadFcm(state);
} else {
const utc = localTimeTextToUtc(
settings.notifyingNewActivitySmsTime || "",
);
if (!utc) {
logger.warn(
"[NewActivityRefresh] Unreadable SMS time; texts not re-authorized:",
settings.notifyingNewActivitySmsTime,
);
continue;
}
ok = await dependencies.uploadSms(
did,
utc.notifyHourUtc,
utc.notifyMinuteUtc,
state,
);
}
if (ok) uploaded[channel] = cursors;
} catch (error) {
logger.warn(
`[NewActivityRefresh] ${channel} re-authorization failed:`,
error,
);
}
}
return uploaded;
}
@@ -21,6 +21,7 @@
import type {
AlertAuthorizationRequestBody,
AlertAuthorizationResponse,
AlertSearchUploadState,
AlertAuthorizationRevokeResponse,
NotifySmsFailure,
SmsActionJwtPayload,
@@ -172,7 +173,7 @@ type SmsRequestOptions = SmsActionTarget & {
| SmsPhoneRegisterRequest
| SmsPhoneVerifyRequest
| SmsPhoneDeleteRequest
| AlertAuthorizationRequestBody;
| (AlertAuthorizationRequestBody & AlertSearchUploadState);
};
async function smsRequest<T>(
@@ -327,17 +328,19 @@ export async function deleteSmsPhone(
*
* @param notifyHourUtc UTC hour, 0-23
* @param notifyMinuteUtc UTC minute, 0-59
* @param searchState cursors to count from, and the starred handle IDs and
* area the daily search uses; see {@link AlertSearchUploadState}
*/
export async function authorizeSmsAlertSearch(
did: string,
notifyHourUtc: number,
notifyMinuteUtc: number,
searchState?: AlertSearchUploadState,
): Promise<AlertAuthorizationResponse> {
const body = await buildAlertAuthorizationBody(
did,
notifyHourUtc,
notifyMinuteUtc,
);
const body = {
...(await buildAlertAuthorizationBody(did, notifyHourUtc, notifyMinuteUtc)),
...searchState,
};
return smsRequest<AlertAuthorizationResponse>(did, {
method: "POST",
path: "/notify-sms/alert-authorization",
@@ -1546,9 +1546,6 @@ export class CapacitorPlatformService
return false;
}
// --- PWA/Web-only methods (no-op for Capacitor) ---
public registerServiceWorker(): void {}
// Database utility methods - inherited from BaseDatabaseService
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
@@ -163,7 +163,4 @@ export class ElectronPlatformService extends CapacitorPlatformService {
isWeb(): boolean {
return false;
}
// --- PWA/Web-only methods (no-op for Electron) ---
public registerServiceWorker(): void {}
}
+610
View File
@@ -0,0 +1,610 @@
jest.mock("@/libs/endorserServer", () => ({
getHeaders: jest.fn(async () => ({ "Content-Type": "application/json" })),
}));
jest.mock("@/utils/logger", () => ({ logger: { warn: jest.fn() } }));
jest.mock("@/services/notifications/alertAuthorization", () => ({
uploadAlertSearchAuthorization: jest.fn(),
}));
jest.mock("@/services/notifications/smsNotificationApi", () => ({
authorizeSmsAlertSearch: jest.fn(),
}));
jest.mock("@/services/notifications/alertAuthorizationBatch", () => ({
localTimeTextToUtc: (text: string) =>
text === "9:00 AM" ? { notifyHourUtc: 15, notifyMinuteUtc: 0 } : null,
}));
import type { Axios } from "axios";
import {
collectAlertSearchForward,
mergeAlertSearchData,
} from "@/libs/alertSearch";
import {
joinCursorPair,
nextWindow,
parseCursorParam,
parseNewActivityCursorState,
SAME_VISIT_MS,
seededState,
startParams,
summaryStart,
ulidJustBefore,
unseenStart,
windowStart,
} from "@/libs/newActivity";
import {
alertSearchUploadState,
countNewActivity,
countSummaryActivity,
countUnseenActivity,
latestCursorPair,
loadBucket,
loadBucketEarlier,
NewActivityContext,
seedIfNeeded,
totalNewActivity,
} from "@/services/newActivity";
import {
enabledNotificationChannels,
refreshNotificationAuthorizations,
} from "@/services/notifications/newActivityRefresh";
const NOW = new Date("2026-10-15T12:00:00.000Z");
const minutesAgo = (m: number) =>
new Date(NOW.getTime() - m * 60 * 1000).toISOString();
describe("visit windows", () => {
it("inside a visit, counts from the same start and keeps the start time", () => {
const window = { from: "10", to: "20", at: minutesAgo(5) };
expect(windowStart(window, NOW)).toEqual("10");
expect(nextWindow(window, "25", NOW)).toEqual({
from: "10",
to: "25",
at: window.at,
seenAt: NOW.toISOString(),
});
});
it("after a visit, the next one starts where it ended", () => {
const window = { from: "10", to: "20", at: minutesAgo(31) };
expect(SAME_VISIT_MS).toEqual(30 * 60 * 1000);
expect(windowStart(window, NOW)).toEqual("20");
expect(nextWindow(window, "25", NOW)).toEqual({
from: "20",
fromSeenAt: window.at,
to: "25",
at: NOW.toISOString(),
seenAt: NOW.toISOString(),
});
});
it("with no window, there is no start and the first window has none", () => {
expect(windowStart(undefined, NOW)).toBeUndefined();
expect(nextWindow(undefined, "5", NOW)).toEqual({
to: "5",
at: NOW.toISOString(),
seenAt: NOW.toISOString(),
});
});
it("reads missing or broken stored state as empty", () => {
expect(parseNewActivityCursorState(undefined)).toEqual({});
expect(parseNewActivityCursorState("{not json")).toEqual({});
});
});
describe("notification link cursors", () => {
it("round-trips the endorser and partner cursors through 'c'", () => {
const pair = { endorser: "48213", partner: "912-48213" };
expect(joinCursorPair(pair)).toEqual("48213.912-48213");
expect(parseCursorParam("48213.912-48213")).toEqual(pair);
});
it("rejects a value without both halves", () => {
expect(parseCursorParam("48213")).toBeUndefined();
expect(parseCursorParam(".912-48213")).toBeUndefined();
expect(parseCursorParam("48213.")).toBeUndefined();
expect(parseCursorParam(undefined)).toBeUndefined();
});
});
describe("first load without cursors", () => {
it("sends no cursor or ID without a start", () => {
expect(startParams(undefined)).toEqual({});
expect(startParams("7")).toEqual({ afterCursor: "7" });
});
it("counts and lists nothing, but returns where the server is", async () => {
const { axios, calls } = fakeAxios((url) =>
url.includes("/api/partner/") ? partnerBody : endorserBody(3, "100"),
);
const counts = await countNewActivity(context(axios), undefined);
expect(calls.map((c) => c.body)).toEqual([{}, {}]);
expect(totalNewActivity(counts)).toEqual(0);
expect(counts.endorser.to).toEqual("100");
expect(counts.partner.to).toEqual("5-100");
const page = await loadBucket(context(axios), "claims", undefined);
expect(page.rows).toEqual([]);
expect(page.nextAfterCursor).toEqual("100");
expect(page.hasMore).toBe(false);
});
it("seeds a visit at the latest cursors, which the next load counts from", async () => {
const { axios } = fakeAxios((url) =>
url.includes("/api/partner/") ? partnerBody : endorserBody(3, "100"),
);
const { state, seeded } = await seedIfNeeded(context(axios), {}, NOW);
expect(seeded).toBe(true);
expect(state.visit).toEqual(
seededState({}, { endorser: "100", partner: "5-100" }, NOW).visit,
);
expect(windowStart(state.visit, NOW)).toEqual({
endorser: "100",
partner: "5-100",
});
expect(unseenStart(state, "claims")).toEqual("100");
// a state with a visit is left alone
expect(await seedIfNeeded(context(axios), state, NOW)).toEqual({
state,
seeded: false,
});
});
it("does not seed when a server does not answer", async () => {
const { axios } = fakeAxios((url) => {
if (url.includes("/api/partner/")) throw new Error("partner down");
return endorserBody(0);
});
expect(await seedIfNeeded(context(axios), {}, NOW)).toEqual({
state: {},
seeded: false,
});
});
});
describe("ulidJustBefore", () => {
it("steps the last character back, borrowing across zeros", () => {
expect(ulidJustBefore("01J00000000000000000000003")).toEqual(
"01J00000000000000000000002",
);
expect(ulidJustBefore("01J00000000000000000000010")).toEqual(
"01J0000000000000000000000Z",
);
expect(ulidJustBefore("00000000000000000000000000")).toBeUndefined();
expect(ulidJustBefore("01J-bad")).toBeUndefined();
});
});
describe("collectAlertSearchForward", () => {
const page = (
claims: string[],
nextAfterCursor: string,
hasMore: boolean,
) => ({
data: {
claims: claims.map((id) => ({ id, issuedAt: "", issuer: "x" })),
personalPlanContributions: [],
trackedPlanUpdates: [],
trackedPlanClaims: [],
plansNearby: [],
},
nextAfterCursor,
hasMore,
});
it("pages from the cursor while hasMore and drops repeated rows", async () => {
const fetchPage = jest
.fn()
.mockResolvedValueOnce(page(["a", "b"], "20", true))
.mockResolvedValueOnce(page(["b", "c"], "30", false));
const result = await collectAlertSearchForward(
fetchPage,
"endorser",
{ afterCursor: "10" },
4,
);
expect(fetchPage.mock.calls.map((c) => c[0])).toEqual([
{ afterCursor: "10" },
{ afterCursor: "20" },
]);
expect(result.data.claims.map((c) => c.id)).toEqual(["a", "b", "c"]);
expect(result.nextAfterCursor).toEqual("30");
expect(result.hasMore).toBe(false);
});
it("stops at maxPages and reports more to read", async () => {
const fetchPage = jest.fn().mockResolvedValue(page(["a"], "20", true));
fetchPage.mockResolvedValueOnce(page(["a"], "15", true));
const result = await collectAlertSearchForward(
fetchPage,
"endorser",
{ afterCursor: "10" },
2,
);
expect(fetchPage).toHaveBeenCalledTimes(2);
expect(result.hasMore).toBe(true);
});
it("reads one page without a cursor", async () => {
const fetchPage = jest.fn().mockResolvedValue(page(["a"], "20", true));
await collectAlertSearchForward(fetchPage, "endorser", {}, 4);
expect(fetchPage).toHaveBeenCalledTimes(1);
});
it("merges similar matches by the record inside them", () => {
const merged = mergeAlertSearchData(
{
profilesSimilar: [{ similarity: 0.9, profile: { rowId: 1 } }],
},
{
profilesSimilar: [
{ similarity: 0.8, profile: { rowId: 1 } },
{ similarity: 0.7, profile: { rowId: 2 } },
],
},
);
expect(merged.profilesSimilar).toHaveLength(2);
});
});
function fakeAxios(
handler: (url: string, body: Record<string, unknown>) => unknown,
): {
axios: Axios;
calls: Array<{ url: string; body: Record<string, unknown> }>;
} {
const calls: Array<{ url: string; body: Record<string, unknown> }> = [];
const axios = {
post: jest.fn(async (url: string, body: Record<string, unknown>) => {
calls.push({ url, body });
return { data: handler(url, body) };
}),
} as unknown as Axios;
return { axios, calls };
}
function context(
axios: Axios,
overrides: Partial<NewActivityContext> = {},
): NewActivityContext {
return {
axios,
endorserServer: "https://api.example",
partnerServer: "https://partner.example",
activeDid: "did:ethr:0xme",
planHandleIds: [],
...overrides,
};
}
const endorserBody = (claims: number, nextAfterCursor = "100") => ({
data: {
claims: Array.from({ length: claims }, (_, i) => ({ id: "c" + i })),
personalPlanContributions: [{ id: "p1" }],
trackedPlanUpdates: [],
trackedPlanClaims: [],
plansNearby: [],
},
nextAfterCursor,
hasMore: false,
});
const partnerBody = {
data: {
profilesNearby: [],
profilesSimilar: [{ similarity: 0.9, profile: { rowId: 3 } }],
},
nextAfterCursor: "5-100",
hasMore: false,
};
describe("countNewActivity", () => {
it("counts each available bucket, sends the inputs, and totals like the service", async () => {
const { axios, calls } = fakeAxios((url) =>
url.includes("/api/partner/") ? partnerBody : endorserBody(2),
);
const location = { minLocLat: 1, maxLocLat: 2, minLocLon: 3, maxLocLon: 4 };
const counts = await countNewActivity(
context(axios, { planHandleIds: ["h1"], location }),
{ endorser: "90", partner: "4-90" },
);
expect(counts.endorser.counts).toEqual({
claims: 2,
personalPlanContributions: 1,
trackedPlanUpdates: 0,
trackedPlanClaims: 0,
plansNearby: 0,
});
expect(counts.partner.counts).toEqual({
profilesNearby: 0,
profilesSimilar: 1,
plansSimilar: 0,
});
expect(totalNewActivity(counts)).toEqual(4);
const endorserCall = calls.find((c) => c.url.includes("/report/"));
expect(endorserCall?.body).toEqual({
location,
planHandleIds: ["h1"],
afterCursor: "90",
});
const partnerCall = calls.find((c) => c.url.includes("/api/partner/"));
expect(partnerCall?.body).toEqual({ location, afterCursor: "4-90" });
});
it("leaves out buckets whose inputs are missing, and keeps a failed server apart", async () => {
const { axios } = fakeAxios((url) => {
if (url.includes("/api/partner/")) throw new Error("partner down");
return endorserBody(1);
});
const counts = await countNewActivity(context(axios), {
endorser: "90",
partner: "4-90",
});
expect(counts.endorser.counts).toEqual({
claims: 1,
personalPlanContributions: 1,
});
expect(counts.partner.error).toEqual("partner down");
expect(counts.partner.counts).toEqual({});
});
});
describe("Home counts", () => {
const visit = {
from: { endorser: "10", partner: "1-10" },
to: { endorser: "20", partner: "2-20" },
at: minutesAgo(5),
seenAt: minutesAgo(5),
};
it("starts each bucket at the end of whichever load was seen last", () => {
const state = {
visit,
buckets: {
claims: {
from: "20",
to: "30",
at: minutesAgo(2),
seenAt: minutesAgo(2),
},
trackedPlanUpdates: {
to: "15",
at: minutesAgo(60),
seenAt: minutesAgo(60),
},
},
};
// opened after the summary: from the list's end, not the visit's start
expect(unseenStart(state, "claims")).toEqual("30");
// opened before the summary: from the summary's end
expect(unseenStart(state, "trackedPlanUpdates")).toEqual("20");
expect(unseenStart(state, "profilesNearby")).toEqual("2-20");
expect(unseenStart({}, "claims")).toBeUndefined();
expect(
unseenStart(
{ buckets: { claims: { to: "7", at: minutesAgo(1) } } },
"claims",
),
).toEqual("7");
});
it("shares one read among buckets with the same start", async () => {
const { axios, calls } = fakeAxios((url) =>
url.includes("/api/partner/") ? partnerBody : endorserBody(2, "40"),
);
const counts = await countUnseenActivity(context(axios), {
visit,
buckets: {
claims: { to: "30", at: minutesAgo(2), seenAt: minutesAgo(2) },
},
});
expect(calls.map((c) => c.body.afterCursor).sort()).toEqual([
"2-20",
"20",
"30",
]);
expect(counts.buckets.claims).toEqual({ count: 2, hitLimit: false });
expect(counts.buckets.personalPlanContributions).toEqual({
count: 1,
hitLimit: false,
});
expect(counts.buckets.profilesSimilar).toEqual({
count: 1,
hitLimit: false,
});
// inputs missing: not counted
expect(counts.buckets.trackedPlanUpdates).toBeUndefined();
expect(counts.errors).toEqual([]);
});
it("leaves a failed server's buckets out and reports the error once", async () => {
const { axios } = fakeAxios((url) => {
if (url.includes("/api/partner/")) throw new Error("partner down");
return endorserBody(0);
});
const counts = await countUnseenActivity(context(axios), { visit });
expect(counts.buckets.profilesSimilar).toBeUndefined();
expect(counts.buckets.claims).toEqual({ count: 0, hitLimit: false });
expect(counts.errors).toEqual(["partner down"]);
});
});
describe("summary counts", () => {
// the summary first loaded 5 minutes ago, counting from "10" seen an hour ago
const visit = {
from: { endorser: "10", partner: "1-10" },
fromSeenAt: minutesAgo(60),
to: { endorser: "20", partner: "2-20" },
at: minutesAgo(5),
seenAt: minutesAgo(5),
};
it("counts an opened list from its end and the rest from the visit start", () => {
const state = {
visit,
buckets: {
// opened after the visit's start was seen: read up to its end
claims: {
from: "10",
to: "30",
at: minutesAgo(2),
seenAt: minutesAgo(2),
},
// opened between the start and this visit: still read
plansNearby: { to: "15", at: minutesAgo(20), seenAt: minutesAgo(20) },
// opened before the start: the visit start is later
trackedPlanUpdates: {
to: "5",
at: minutesAgo(90),
seenAt: minutesAgo(90),
},
},
};
expect(summaryStart(state, "claims", NOW)).toEqual("30");
expect(summaryStart(state, "plansNearby", NOW)).toEqual("15");
expect(summaryStart(state, "trackedPlanUpdates", NOW)).toEqual("10");
expect(summaryStart(state, "profilesNearby", NOW)).toEqual("1-10");
// after the visit, everything counts from its end unless opened since
const later = new Date(NOW.getTime() + 40 * 60 * 1000);
expect(summaryStart(state, "claims", later)).toEqual("30");
expect(summaryStart(state, "plansNearby", later)).toEqual("20");
// a notification link stands in for a visit without a start
expect(
summaryStart({}, "claims", NOW, { endorser: "8", partner: "1-8" }),
).toEqual("8");
});
it("drops an opened list's count and ends the visit at the visit-start read", async () => {
const { axios, calls } = fakeAxios((url, body) => {
if (url.includes("/api/partner/")) return partnerBody;
// nothing new after the list's end; the visit-start read ends at "40"
return body.afterCursor === "30"
? { data: {}, nextAfterCursor: "41", hasMore: false }
: endorserBody(2, "40");
});
const counts = await countSummaryActivity(
context(axios),
{
visit,
buckets: {
claims: { to: "30", at: minutesAgo(2), seenAt: minutesAgo(2) },
},
},
NOW,
);
expect(calls.map((c) => c.body.afterCursor).sort()).toEqual([
"1-10",
"10",
"30",
]);
expect(counts.endorser.counts).toEqual({
claims: 0,
personalPlanContributions: 1,
});
expect(counts.endorser.to).toEqual("40");
expect(counts.endorser.bucketHitLimit).toEqual({
claims: false,
personalPlanContributions: false,
});
expect(counts.partner.counts.profilesSimilar).toEqual(1);
});
});
describe("latest cursors for a first upload", () => {
it("keeps the cursor of the server that answered", async () => {
const { axios } = fakeAxios((url) => {
if (url.includes("/api/partner/")) throw new Error("partner down");
return endorserBody(0, "77");
});
const latest = await latestCursorPair(context(axios));
expect(latest).toEqual({ endorser: "77" });
expect(alertSearchUploadState({ planHandleIds: [] }, latest)).toEqual({
endorserAfterCursor: "77",
planHandleIds: null,
location: null,
});
});
});
describe("loadBucketEarlier", () => {
it("steps back past pages that hold none of the bucket", async () => {
const pages = [
{ claims: [], nextBeforeCursor: "80", hasMore: true },
{ claims: [{ id: "old" }], nextBeforeCursor: "60", hasMore: true },
];
let index = 0;
const { axios, calls } = fakeAxios(() => {
const p = pages[index++];
return {
data: { ...endorserBody(0).data, claims: p.claims },
nextBeforeCursor: p.nextBeforeCursor,
hasMore: p.hasMore,
};
});
const page = await loadBucketEarlier(context(axios), "claims", "100");
expect(calls.map((c) => c.body.beforeCursor)).toEqual(["100", "80"]);
expect(page.rows).toEqual([{ id: "old" }]);
expect(page.nextBeforeCursor).toEqual("60");
expect(page.hasMore).toBe(true);
});
});
describe("notification refresh", () => {
const cursors = { endorser: "100", partner: "5-100" };
it("knows which channels are on", () => {
expect(
enabledNotificationChannels({
notifyingNewActivityTime: "9:00 AM",
notifyingNewActivitySmsTime: "9:00 AM",
smsNotificationsEnabled: false,
}),
).toEqual(["fcm"]);
expect(
enabledNotificationChannels({
notifyingNewActivitySmsTime: "9:00 AM",
smsNotificationsEnabled: true,
}),
).toEqual(["sms"]);
});
it("uploads each channel with the cursors and reports the ones that took", async () => {
const state = alertSearchUploadState(
{ planHandleIds: ["h1"], location: undefined },
cursors,
);
expect(state).toEqual({
endorserAfterCursor: "100",
partnerAfterCursor: "5-100",
planHandleIds: ["h1"],
location: null,
});
const uploadFcm = jest.fn().mockResolvedValue(false);
const uploadSms = jest.fn().mockResolvedValue(true);
const uploaded = await refreshNotificationAuthorizations(
"did:ethr:0xme",
{ notifyingNewActivitySmsTime: "9:00 AM" },
["fcm", "sms"],
cursors,
state,
{ uploadFcm, uploadSms },
);
expect(uploadFcm).toHaveBeenCalledWith(state);
expect(uploadSms).toHaveBeenCalledWith("did:ethr:0xme", 15, 0, state);
expect(uploaded).toEqual({ sms: cursors });
});
it("skips texts with an unreadable time and survives a thrown upload", async () => {
const uploaded = await refreshNotificationAuthorizations(
"did:ethr:0xme",
{ notifyingNewActivitySmsTime: "whenever" },
["fcm", "sms"],
cursors,
{},
{
uploadFcm: jest.fn().mockRejectedValue(new Error("offline")),
uploadSms: jest.fn(),
},
);
expect(uploaded).toEqual({});
});
});
+82 -6
View File
@@ -638,7 +638,7 @@
color="white"
aria-hidden="true"
></font-awesome>
<span class="text-white">Unsavedaroonosity</span>
<span class="text-white">Unsaved</span>
</button>
<div class="mt-2" role="group" aria-label="Quick server selection">
<button
@@ -1086,6 +1086,19 @@ import {
UnsupportedIdentityError,
} from "@/services/notifications";
import { DailyNotification } from "@/plugins/DailyNotificationPlugin";
import type { AlertSearchUploadState } from "@/interfaces/notifyApi";
import {
type CursorPair,
NotificationChannel,
parseNewActivityCursorState,
seededState,
serializeNewActivityCursorState,
} from "@/libs/newActivity";
import {
alertSearchUploadState,
latestCursorPair,
} from "@/services/newActivity";
import { buildNewActivityContext } from "@/services/newActivityContext";
// Profile data interface (inlined from ProfileService)
interface ProfileData {
description: string;
@@ -1576,9 +1589,14 @@ export default class AccountViewView extends Vue {
if (Capacitor.isNativePlatform()) {
await this.scheduleNewActivityDualNotification(timeText);
}
await authorizeInAppNewActivity((message) => {
this.reportAlertSearchAuthorizationFailure("upload", message);
});
const searchState = await this.newActivityStartState("fcm");
await authorizeInAppNewActivity(
(message) => {
this.reportAlertSearchAuthorizationFailure("upload", message);
},
undefined,
searchState,
);
}
});
} else {
@@ -1854,7 +1872,7 @@ export default class AccountViewView extends Vue {
DAILY_CHECK_TITLE,
async (success: boolean, timeText: string) => {
if (!success) return;
const authorized = await this.authorizeSmsAlerts(timeText);
const authorized = await this.authorizeSmsAlerts(timeText, false);
if (!authorized) {
return;
}
@@ -1893,6 +1911,48 @@ export default class AccountViewView extends Vue {
}, 150);
}
/**
* What a notification upload sends when the channel is turned on: the
* latest alertSearch cursors, so the first daily count leaves out everything
* before now, plus the starred projects and search area to search. The
* cursors are recorded as uploaded, and as the New Activity visit when the
* person has none yet. A server that does not answer gets the end of the
* last visit instead; with neither, that server's cursor is left out and
* the service's first run seeds its own.
*/
private async newActivityStartState(
channel: NotificationChannel,
): Promise<AlertSearchUploadState> {
const settings = await this.$accountSettings();
const context = buildNewActivityContext(
this.axios,
this.activeDid,
settings,
);
const state = parseNewActivityCursorState(settings.newActivityCursors);
const latest = await latestCursorPair(context);
const start: Partial<CursorPair> = {
endorser: latest.endorser ?? state.visit?.to.endorser,
partner: latest.partner ?? state.visit?.to.partner,
};
if (start.endorser && start.partner) {
const pair: CursorPair = {
endorser: start.endorser,
partner: start.partner,
};
const withVisit = state.visit
? state
: seededState(state, pair, new Date());
await this.$saveUserSettings(this.activeDid, {
newActivityCursors: serializeNewActivityCursorState({
...withVisit,
uploaded: { ...state.uploaded, [channel]: pair },
}),
});
}
return alertSearchUploadState(context, start);
}
/**
* Mint a delegated JWT batch and upload it with the chosen hour, converted
* to the UTC pair the notify-api schedules on.
@@ -1901,9 +1961,15 @@ export default class AccountViewView extends Vue {
* until the service has the batch.
*
* @param timeText 12-hour local reading from the time picker
* @param startFromNow true when turning texts on: the first count starts
* now. False for a new time, which keeps the service's cursors so nothing
* waiting for the next text is dropped.
* @returns true when the service accepted the authorization
*/
private async authorizeSmsAlerts(timeText: string): Promise<boolean> {
private async authorizeSmsAlerts(
timeText: string,
startFromNow = true,
): Promise<boolean> {
const utcTime = localTimeTextToUtc(timeText);
if (!utcTime) {
logger.error(
@@ -1923,6 +1989,16 @@ export default class AccountViewView extends Vue {
this.activeDid,
utcTime.notifyHourUtc,
utcTime.notifyMinuteUtc,
startFromNow
? await this.newActivityStartState("sms")
: alertSearchUploadState(
buildNewActivityContext(
this.axios,
this.activeDid,
await this.$accountSettings(),
),
undefined,
),
);
return true;
} catch (error) {
+33 -1
View File
@@ -27,8 +27,24 @@
<div class="flex">
<textarea v-model="claimStr" rows="20" class="border-2 w-full"></textarea>
</div>
<div
v-if="hasHiddenDid"
class="my-4 text-sm bg-amber-100 rounded px-3 py-2"
data-testId="hiddenDidWarning"
>
This claim contains identifiers that are hidden from you, shown as "{{
HIDDEN_DID
}}". Remove or replace each one before you send it.
</div>
<button
class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
class="block w-full text-center text-lg font-bold uppercase px-2 py-3 rounded-md"
:class="
hasHiddenDid
? 'bg-slate-300 text-slate-500 cursor-not-allowed'
: // eslint-disable-next-line max-len
'bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white'
"
:disabled="hasHiddenDid"
@click="submitClaim()"
>
Sign &amp; Send
@@ -100,6 +116,15 @@ export default class ClaimAddRawView extends Vue {
apiServer = "";
claimStr = "";
HIDDEN_DID = serverUtil.HIDDEN_DID;
/**
* Whether the claim text still has a placeholder for a DID hidden from this user
*/
get hasHiddenDid(): boolean {
return this.claimStr.includes(serverUtil.HIDDEN_DID);
}
/**
* Lifecycle hook that initializes the view
* Workflow:
@@ -228,6 +253,13 @@ export default class ClaimAddRawView extends Vue {
* @throws Will show error notification if submission fails
*/
async submitClaim() {
if (this.hasHiddenDid) {
this.notify.warning(
"Remove or replace the hidden identifiers before you send it.",
TIMEOUTS.STANDARD,
);
return;
}
const fullClaim = JSON.parse(this.claimStr);
const result = await serverUtil.createAndSubmitClaim(
fullClaim,
+430 -468
View File
File diff suppressed because it is too large Load Diff
-918
View File
@@ -1,918 +0,0 @@
<template>
<!-- CONTENT -->
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
<TopMessage />
<!-- Sub View Heading -->
<div id="SubViewHeading" class="flex gap-4 items-start mb-8">
<h1 class="grow text-xl text-center font-semibold leading-tight">
<span
v-if="
libsUtil.isGiveRecordTheUserCanConfirm(
isRegistered,
veriClaim,
activeDid,
confirmerIdList,
)
"
>
Do you agree?
</span>
<span v-else>Confirmation Details</span>
</h1>
<!-- Back -->
<a
class="order-first text-lg text-center leading-none p-1"
@click="$router.go(-1)"
>
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
</a>
<!-- Help button -->
<router-link
:to="{ name: 'help' }"
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
>
<font-awesome icon="question" class="block text-center w-[1em]" />
</router-link>
</div>
<div v-if="giveDetails && !isLoading">
<div class="flex justify-center">
<button
v-if="
libsUtil.isGiveRecordTheUserCanConfirm(
isRegistered,
veriClaim,
activeDid,
confirmerIdList,
)
"
class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
@click="confirmConfirmClaim()"
>
Confirm
<font-awesome
icon="circle-check"
class="ml-2 text-white cursor-pointer"
/>
</button>
<button
v-else
class="col-span-1 bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
@click="notifyWhyCannotConfirm()"
>
Confirm
<font-awesome
icon="circle-check"
class="ml-2 text-white cursor-pointer"
/>
</button>
</div>
<!-- Details -->
<div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4">
<div class="flex gap-4 overflow-hidden">
<div class="overflow-hidden">
<div class="text-sm">
<div>
<font-awesome icon="arrow-left" class="fa-fw text-slate-400" />
{{ giverName }}
</div>
<div class="ml-6">gave</div>
<div v-if="giveDetails.amount">
<font-awesome
icon="hand-holding-dollar"
class="fa-fw text-slate-400"
/>
{{ displayAmount(giveDetails.unit, giveDetails.amount) }}
</div>
<div v-if="giveDetails.description">
<font-awesome icon="message" class="fa-fw text-slate-400" />
{{ giveDetails.amount ? "and:" : "" }}
{{ giveDetails.description }}
</div>
<div class="ml-6">to</div>
<div>
<font-awesome icon="arrow-right" class="fa-fw text-slate-400" />
{{ recipientName }}
</div>
<div>
<font-awesome icon="calendar" class="fa-fw text-slate-400" />
on
{{ giveDetails.issuedAt.substring(0, 10) }}
</div>
<!-- Fullfills Links -->
<div class="mt-4">
<!-- fullfills links for a give -->
<div v-if="giveDetails?.fulfillsPlanHandleId">
<router-link
:to="
'/project/' +
encodeURIComponent(
giveDetails?.fulfillsPlanHandleId || '',
)
"
class="text-blue-500 mt-2 cursor-pointer"
>
This fulfills a bigger plan
<font-awesome
icon="arrow-up-right-from-square"
class="fa-fw"
/>
</router-link>
</div>
<!-- Show offer fulfillment if this give fulfills an offer -->
<div v-if="giveDetailsOfferFulfillment?.offerHandleId">
<!-- router-link to /claim/ only changes URL path -->
<router-link
:to="
'/claim/' +
encodeURIComponent(
giveDetailsOfferFulfillment.offerHandleId || '',
)
"
class="text-blue-500 mt-2 cursor-pointer"
>
This fulfills
{{
serverUtil.capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
giveDetailsOfferFulfillment.offerType || "Offer",
)
}}
<font-awesome
icon="arrow-up-right-from-square"
class="fa-fw"
/>
</router-link>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="mt-2">
<font-awesome icon="comment" class="text-slate-400" />
{{ issuerName }} posted that.
</div>
<div v-if="libsUtil.isGiveAction(veriClaim)" class="mt-4">
<h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
<span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
<span v-else-if="totalConfirmers() === 1">
One person confirmed this.
</span>
<span v-else> {{ totalConfirmers() }} people confirmed this. </span>
<div v-if="totalConfirmers() > 0">
<div
v-if="
confirmerIdList.length === 0 && confsVisibleToIdList.length === 0
"
>
Nobody that you know confirmed this claim, nor do they have any
confirmers in their network.
</div>
<div
v-if="
confirmerIdList.length === 0 && confsVisibleToIdList.length > 0
"
>
<!-- Only show if this person has links to confirmers (below). -->
Nobody that you know issued or confirmed this claim.
</div>
<div v-if="confirmerIdList.length > 0">
The following people confirmed this claim.
<ul class="ml-4">
<li
v-for="confirmerId in confirmerIdList"
:key="confirmerId"
class="list-disc ml-4"
>
<div class="flex gap-4">
<div class="grow overflow-hidden">
<div class="text-sm">
{{ didInfo(confirmerId) }}
<span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
<button
@click="
copyTextToClipboard(
'The DID of ' + confirmerId,
confirmerId,
)
"
>
<font-awesome
icon="copy"
class="text-slate-400 fa-fw"
/>
</button>
</span>
</div>
</div>
</div>
</li>
</ul>
</div>
<!--
Never need to show this message:
"Nobody that you know can see someone who confirmed this claim."
If there is nobody in the confirmerIdList then we'll show the combined "nobody" message.
If there is somebody in the confirmerIdList then that's all they need to show.
-->
<!-- Now show anyone linked to confirmers. -->
<div v-if="confsVisibleToIdList.length > 0">
The following people can connect you with people who issued or
confirmed this claim.
<ul class="ml-4">
<li
v-for="confsVisibleTo in confsVisibleToIdList"
:key="confsVisibleTo"
class="list-disc ml-4"
>
<div class="flex gap-4">
<div class="grow overflow-hidden">
<div class="text-sm">
{{ didInfo(confsVisibleTo) }}
<span
v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)"
>
<button
@click="
copyTextToClipboard(
'The DID of ' + confsVisibleTo,
confsVisibleTo,
)
"
>
<font-awesome
icon="copy"
class="text-slate-400 fa-fw"
/>
</button>
</span>
</div>
</div>
</div>
</li>
</ul>
</div>
</div>
<!-- explain if user cannot confirm -->
<!-- Note that these conditions are mirrored in userCanConfirm(). -->
<div v-if="!isRegistered">
You cannot confirm this because you are not registered. Find someone
to register you, maybe on the Help page.
</div>
<div v-else-if="giveDetails.issuerDid == activeDid">
You cannot confirm this because you issued this claim, so you already
count as confirming it.
</div>
<div v-else-if="serverUtil.containsHiddenDid(veriClaim.claim)">
You cannot confirm this because some people are hidden.
</div>
</div>
<!--
Note that a similar section is found in ClaimView.vue, and kinda in HiddenDidDialog.vue
-->
<h2
class="font-bold uppercase text-xl text-blue-500 mt-8 cursor-pointer"
@click="showVeriClaimDump = !showVeriClaimDump"
>
Details
<font-awesome v-if="showVeriClaimDump" icon="chevron-up" />
<font-awesome v-else icon="chevron-right" />
</h2>
<div v-if="showVeriClaimDump">
<div
v-if="
serverUtil.containsHiddenDid(veriClaim) &&
R.isEmpty(veriClaimDidsVisible)
"
class="mb-2"
>
Some of the details are not visible to you; they show as "HIDDEN".
They are not visible to any of your direct contacts, either.
<span v-if="canShare">
You can ask one of your contacts to take a look and see if their
contacts can see more details:
<a class="text-blue-500" @click="onClickShareClaim()"
>click to send them this page info</a
>
and see if they can make an introduction. Someone is connected to
people closer to them; if you don't know who to ask, try the person
who registered you.
</span>
<span v-else>
You can ask one of your contacts to take a look and see if their
contacts can see more details:
<a
class="text-blue-500"
@click="
copyTextToClipboard('A link to this page', windowLocation)
"
>click to copy this page info</a
>
and see if they can make an introduction. Someone is connected to
people closer to them; if you don't know who to ask, try the person
who registered you.
</span>
</div>
<div v-if="!R.isEmpty(veriClaimDidsVisible)">
Some of the details are not visible to you but they are visible to
some of your contacts.
<span v-if="canShare">
If you'd like an introduction,
<a class="text-blue-500" @click="onClickShareClaim()"
>click to share the information with them and ask if they'll tell
you more about the participants.</a
>
</span>
<span v-else>
If you'd like an introduction,
<a
class="text-blue-500"
@click="
copyTextToClipboard('A link to this page', windowLocation)
"
>share this page with them and ask if they'll tell you more about
about the participants.</a
>
</span>
<div
v-for="(visibleDidPath, index) of Object.keys(veriClaimDidsVisible)"
:key="index"
class="list-disc p-4"
>
<div class="text-sm">
<font-awesome icon="minus" class="fa-fw" />
The {{ visibleDidPath }} is visible to:
</div>
<div class="ml-12 p-1">
<ul>
<li
v-for="(visDid, idx2) of veriClaimDidsVisible[visibleDidPath]"
:key="idx2"
class="list-disc"
>
<div class="text-sm mt-2">
<span>
{{ didInfo(visDid) }}
<span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
<button
@click="
copyTextToClipboard('The DID of ' + visDid, visDid)
"
>
<font-awesome
icon="copy"
class="text-slate-400 fa-fw"
/>
</button>
</span>
<span v-if="veriClaim.publicUrls?.[visDid]"
>, found at
<font-awesome
icon="globe"
class="fa-fw text-slate-400"
/>
<a
:href="veriClaim.publicUrls?.[visDid]"
class="text-blue-500"
>{{
veriClaim.publicUrls[visDid].substring(
veriClaim.publicUrls[visDid].indexOf("//") + 2,
)
}}
</a>
</span>
</span>
</div>
</li>
</ul>
</div>
</div>
</div>
<!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
<pre
class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
>{{ veriClaimDump }}</pre
>
<div class="mt-2 ml-2">
<a
class="text-blue-500 cursor-pointer"
@click="showClaimPage(veriClaim.id)"
>
<font-awesome icon="file-lines" />
See All Generic Info
</a>
</div>
<div class="mt-2 ml-2">
<router-link
v-if="isRegistered"
class="text-blue-500 cursor-pointer"
:to="urlForNewGive"
>
<font-awesome icon="file-lines" />
Record a Give Similar to the Original
</router-link>
</div>
</div>
</div>
<div v-else-if="!isLoading">This does not have details to confirm.</div>
<div
v-if="isLoading"
class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
>
<font-awesome icon="spinner" class="fa-spin-pulse"></font-awesome>
</div>
</section>
</template>
<script lang="ts">
import * as yaml from "js-yaml";
import * as R from "ramda";
import { Component, Vue } from "vue-facing-decorator";
import { copyToClipboard } from "../services/ClipboardService";
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
import QuickNav from "../components/QuickNav.vue";
import { NotificationIface } from "../constants/app";
import { Contact } from "../db/tables/contacts";
import * as serverUtil from "../libs/endorserServer";
import { GenericVerifiableCredential, GiveSummaryRecord } from "../interfaces";
import { displayAmount } from "../libs/endorserServer";
import * as libsUtil from "../libs/util";
import { retrieveAccountDids } from "../libs/util";
import TopMessage from "../components/TopMessage.vue";
import { logger } from "../utils/logger";
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
import { APP_SERVER } from "@/constants/app";
import {
NOTIFY_GIFT_ERROR_LOADING,
NOTIFY_GIFT_CONFIRMATION_SUCCESS,
NOTIFY_GIFT_CONFIRMATION_ERROR,
NOTIFY_GIFT_CONFIRM_MODAL,
NOTIFY_COPIED_TO_CLIPBOARD,
} from "@/constants/notifications";
/**
* ConfirmGiftView Component
*
* Displays details about a gift claim and allows users to confirm it if eligible.
* Shows gift details including giver, recipient, amount, description, and confirmation status.
* Handles visibility of hidden DIDs and provides access to detailed claim information.
*
* Key features:
* - Gift confirmation workflow
* - Detailed gift information display
* - Confirmation status tracking
* - Hidden DID handling
* - Claim details expansion
*/
@Component({
components: {
QuickNav,
TopMessage,
},
mixins: [PlatformServiceMixin],
})
export default class ConfirmGiftView extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
$route!: RouteLocationNormalizedLoaded;
$router!: Router;
/** Notification helper methods */
notify!: ReturnType<typeof createNotifyHelpers>;
activeDid = "";
allMyDids: Array<string> = [];
allContacts: Array<Contact> = [];
apiServer = "";
canShare = false;
claimId = "";
confirmerIdList: string[] = []; // list of DIDs that have confirmed this claim excluding the issuer
confsVisibleErrorMessage = "";
confsVisibleToIdList: string[] = []; // list of DIDs that can see any confirmer
giveDetails?: GiveSummaryRecord;
// Additional offer information extracted from the fulfills array
giveDetailsOfferFulfillment: {
offerHandleId?: string;
offerType?: string;
} | null = null;
giverName = "";
issuerName = "";
isLoading = false;
isRegistered = false;
numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
recipientName = "";
showVeriClaimDump = false;
urlForNewGive = "";
veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
veriClaimDump = "";
veriClaimDidsVisible: { [key: string]: string[] } = {};
windowLocation = window.location.href; // this is changed to a deep link in the setup
R = R;
yaml = yaml;
libsUtil = libsUtil;
serverUtil = serverUtil;
displayAmount = displayAmount;
APP_SERVER = APP_SERVER;
/**
* Component lifecycle hook that initializes notification helpers
*/
created() {
this.notify = createNotifyHelpers(this.$notify);
}
/**
* Initializes the view with gift claim information
*
* Workflow:
* 1. Retrieves active account settings
* 2. Loads gift claim details from ID in URL
* 3. Processes claim information for display
* 4. Checks user's ability to confirm the gift
*/
async mounted() {
this.isLoading = true;
// Read the claim id from the URL before the first await, so nothing can
// render or act against an empty id while the awaits below resolve.
this.claimId = decodeURIComponent(
window.location.pathname.substring("/confirm-gift/".length),
);
try {
await this.initializeSettings();
await this.loadClaimFromUrl();
} catch (error) {
logger.error("Error in mounted:", error);
this.handleMountError(error);
} finally {
this.isLoading = false;
}
}
/**
* Initializes component settings and user data
*/
private async initializeSettings() {
const settings = await this.$accountSettings();
// Get activeDid from active_identity table (single source of truth)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const activeIdentity = await (this as any).$getActiveIdentity();
this.activeDid = activeIdentity.activeDid || "";
this.apiServer = settings.apiServer || "";
this.allContacts = await this.$getAllContacts();
this.isRegistered = settings.isRegistered || false;
this.allMyDids = await retrieveAccountDids();
// Check share capability
// When Chrome compatibility is fixed https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
// then use this truer check: navigator.canShare && navigator.canShare()
this.canShare = !!navigator.share;
}
/**
* Loads and processes claim from URL parameters
*/
private async loadClaimFromUrl() {
const claimId = this.claimId;
if (!claimId) {
throw new Error("No claim ID was provided.");
}
// Use production URL for sharing to avoid localhost issues in development
this.windowLocation = `${APP_SERVER}/deep-link/confirm-gift/${claimId}`;
await this.loadClaim(claimId, this.activeDid);
}
/**
* Handles errors during component mounting
*/
private handleMountError(error: unknown) {
this.notify.error(
error instanceof Error
? error.message
: NOTIFY_GIFT_ERROR_LOADING.message,
TIMEOUTS.STANDARD,
);
}
/**
* Loads claim details and associated give information
*
* @param claimId - ID of claim to load
* @param userDid - User's DID
*/
private async loadClaim(claimId: string, userDid: string) {
await this.fetchClaimDetails(claimId, userDid);
if (this.veriClaim.claimType === "GiveAction") {
await this.fetchGiveDetails(claimId, userDid);
await this.processGiveDetails();
await this.fetchConfirmerInfo(claimId, userDid);
}
}
/**
* Fetches basic claim details from server
*/
private async fetchClaimDetails(claimId: string, userDid: string) {
const urlPath = libsUtil.isGlobalUri(claimId)
? "/api/claim/byHandle/"
: "/api/claim/";
const url = this.apiServer + urlPath + encodeURIComponent(claimId);
try {
const headers = await serverUtil.getHeaders(userDid);
const resp = await this.axios.get(url, { headers });
if (resp.status === 200) {
this.veriClaim = resp.data;
this.veriClaimDump = yaml.dump(this.veriClaim);
this.veriClaimDidsVisible = libsUtil.findAllVisibleToDids(
this.veriClaim,
true,
);
this.issuerName = this.didInfo(this.veriClaim.issuer);
} else {
throw new Error("Error getting claim: " + resp.status);
}
} catch (error) {
logger.error("Error getting claim:", error);
throw new Error("There was a problem retrieving that claim.");
}
}
/**
* Fetches detailed give information
*/
private async fetchGiveDetails(claimId: string, userDid: string) {
const param = libsUtil.isGlobalUri(claimId) ? "handleId" : "jwtId";
const giveUrl = `${this.apiServer}/api/v2/report/gives?${param}=${encodeURIComponent(claimId)}`;
try {
const headers = await serverUtil.getHeaders(userDid);
const resp = await this.axios.get(giveUrl, { headers });
if (resp.status === 200) {
this.giveDetails = resp.data.data[0];
// Extract offer information from the fulfills array
this.extractOfferFulfillment();
} else {
throw new Error("Error getting detailed give info: " + resp.status);
}
} catch (error) {
logger.error("Error getting detailed give info:", error);
throw new Error("Something went wrong retrieving gift data.");
}
}
/**
* Processes give details and builds URL for new give
*/
private async processGiveDetails() {
if (!this.giveDetails) return;
this.urlForNewGive = "/gifted-details?";
/**
* Add basic give details to URL
*/
if (this.giveDetails?.amount) {
this.urlForNewGive += `&amountInput=${encodeURIComponent(String(this.giveDetails.amount))}`;
}
if (this.giveDetails?.unit) {
this.urlForNewGive += `&unitCode=${encodeURIComponent(this.giveDetails.unit)}`;
}
if (this.giveDetails?.description) {
this.urlForNewGive += `&description=${encodeURIComponent(this.giveDetails.description)}`;
}
/**
* Add participant (giver/recipient) name & URL info
*/
this.giverName = this.didInfo(this.giveDetails?.agentDid);
if (this.giveDetails?.agentDid) {
this.urlForNewGive += `&giverDid=${encodeURIComponent(this.giveDetails.agentDid)}&giverName=${encodeURIComponent(this.giverName)}`;
}
this.recipientName = this.didInfo(this.giveDetails?.recipientDid);
if (this.giveDetails?.recipientDid) {
this.urlForNewGive += `&recipientDid=${encodeURIComponent(this.giveDetails.recipientDid)}&recipientName=${encodeURIComponent(this.recipientName)}`;
}
/**
* Add additional give details to URL (image, offer, plan)
*/
if (this.giveDetails?.fullClaim.image) {
this.urlForNewGive += `&image=${encodeURIComponent(this.giveDetails.fullClaim.image)}`;
}
if (
this.giveDetails?.type === "Offer" &&
this.giveDetails?.fulfillsHandleId
) {
this.urlForNewGive += `&offerId=${encodeURIComponent(this.giveDetails.fulfillsHandleId)}`;
}
if (this.giveDetails?.fulfillsPlanHandleId) {
this.urlForNewGive += `&fulfillsProjectId=${encodeURIComponent(this.giveDetails.fulfillsPlanHandleId)}`;
}
}
/**
* Extract offer fulfillment information from the fulfills array
*/
private extractOfferFulfillment() {
this.giveDetailsOfferFulfillment = libsUtil.extractOfferFulfillment(
this.giveDetails?.fullClaim?.fulfills,
);
}
/**
* Fetches confirmer information for the claim
*/
private async fetchConfirmerInfo(claimId: string, userDid: string) {
const confirmerInfo = await libsUtil.retrieveConfirmerIdList(
this.apiServer,
claimId,
this.veriClaim.issuer,
userDid,
);
if (confirmerInfo) {
this.confirmerIdList = confirmerInfo.confirmerIdList;
this.confsVisibleToIdList = confirmerInfo.confsVisibleToIdList;
this.numConfsNotVisible = confirmerInfo.numConfsNotVisible;
} else {
this.confsVisibleErrorMessage = "Had problems retrieving confirmations.";
}
}
/**
* Calculates total number of confirmers for the gift
* Includes both direct confirmers and those visible through network
*
* @returns Total number of confirmers
*/
totalConfirmers(): number {
return (
this.numConfsNotVisible +
this.confirmerIdList.length +
this.confsVisibleToIdList.length
);
}
/**
* Retrieves human-readable name for a DID
* Falls back to DID if no name available
*
* @param did - DID to get name for
* @returns Human-readable name
*/
didInfo(did: string): string {
return serverUtil.didInfo(
did,
this.activeDid,
this.allMyDids,
this.allContacts,
);
}
/**
* Copies text to clipboard and shows notification
*
* @param description - Description of copied content
* @param text - Text to copy
*/
async copyTextToClipboard(description: string, text: string): Promise<void> {
try {
await copyToClipboard(text);
this.notify.toast(
NOTIFY_COPIED_TO_CLIPBOARD.title,
NOTIFY_COPIED_TO_CLIPBOARD.message(description),
TIMEOUTS.SHORT,
);
} catch (error) {
this.$logAndConsole(
`Error copying ${description} to clipboard: ${error}`,
true,
);
this.notify.error(`Failed to copy ${description} to clipboard.`);
}
}
/**
* Navigates to claim page for detailed view
*
* @param claimId - ID of claim to view
*/
showClaimPage(claimId: string): void {
const route = {
path: "/claim/" + encodeURIComponent(claimId),
};
(this.$router as Router).push(route).then(async () => {
this.resetThisValues();
await this.loadClaim(claimId, this.activeDid);
});
}
/**
* Initiates claim confirmation process
* Verifies user eligibility and handles confirmation workflow
*/
async confirmConfirmClaim(): Promise<void> {
this.notify.confirm(NOTIFY_GIFT_CONFIRM_MODAL.message, async () => {
await this.confirmClaim();
});
}
// similar code is found in ProjectViewView
async confirmClaim() {
// similar logic is found in endorser-mobile
const goodClaim = serverUtil.removeSchemaContext(
serverUtil.removeVisibleToDids(
serverUtil.addLastClaimOrHandleAsIdIfMissing(
this.veriClaim.claim,
this.veriClaim.id,
this.veriClaim.handleId,
),
),
);
const confirmationClaim: GenericVerifiableCredential = {
"@context": "https://schema.org",
"@type": "AgreeAction",
object: goodClaim,
};
const result = await serverUtil.createAndSubmitClaim(
confirmationClaim,
this.activeDid,
this.apiServer,
this.axios,
);
if (result.success) {
this.notify.success(
NOTIFY_GIFT_CONFIRMATION_SUCCESS.message,
TIMEOUTS.STANDARD,
);
} else {
logger.error("Got error submitting the confirmation:", result);
this.notify.error(NOTIFY_GIFT_CONFIRMATION_ERROR.message, TIMEOUTS.LONG);
}
}
/**
* Notifies user why they cannot confirm the gift
* Explains requirements or restrictions preventing confirmation
*/
notifyWhyCannotConfirm(): void {
libsUtil.notifyWhyCannotConfirm(
(msg, timeout) => this.notify.error(msg.text ?? "", timeout),
this.isRegistered,
this.veriClaim.claimType,
this.giveDetails,
this.activeDid,
this.confirmerIdList,
);
}
/**
* Initiates sharing of claim information
* Handles share functionality based on platform capabilities
*/
async onClickShareClaim(): Promise<void> {
this.copyTextToClipboard("A link to this page", this.windowLocation);
window.navigator.share({
title: "Help Connect Me",
text: "I'm trying to find the full details of this claim. Can you help me?",
url: this.windowLocation,
});
}
resetThisValues() {
this.confirmerIdList = [];
this.confsVisibleErrorMessage = "";
this.confsVisibleToIdList = [];
this.giveDetails = undefined;
this.isRegistered = false;
this.numConfsNotVisible = 0;
this.urlForNewGive = "";
this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
this.veriClaimDump = "";
}
}
</script>
+5
View File
@@ -29,6 +29,11 @@
</router-link>
</div>
<div v-if="message" class="mb-4 text-sm bg-slate-100 rounded px-3 py-2">
<font-awesome icon="circle-info" class="fa-fw text-slate-500" />
{{ message }}
</div>
<h2 class="text-lg font-normal leading-tight text-center overflow-hidden">
<div class="truncate">
From
+131 -271
View File
@@ -12,6 +12,7 @@ Raymer * @version 1.0.0 */
id="Content"
class="p-6 pb-24 max-w-3xl mx-auto"
:data-active-did="activeDid"
:data-new-activity-loaded="newActivityLoaded"
>
<TopMessage />
@@ -188,60 +189,35 @@ Raymer * @version 1.0.0 */
</button>
</div>
<div
class="border-t p-2 border-slate-300"
@click="goToActivityToUserPage()"
>
<div class="flex justify-center gap-2">
<div
v-if="numNewOffersToUser"
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
<div class="border-t p-2 border-slate-300">
<div
v-if="newActivityTiles.length > 0"
class="grid grid-cols-2 sm:grid-cols-4 gap-2"
>
<router-link
v-for="tile in newActivityTiles"
:key="tile.bucket"
:to="tile.route"
:class="tile.colorClass"
class="bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-2 py-3 rounded-md text-white cursor-pointer"
>
<span
class="block text-center text-6xl"
data-testId="newDirectOffersActivityNumber"
class="block text-center text-5xl"
:data-testId="`newActivityNumber-${tile.bucket}`"
>
{{ numNewOffersToUser }}{{ newOffersToUserHitLimit ? "+" : "" }}
{{ tile.count }}{{ tile.hitLimit ? "+" : "" }}
</span>
<p class="text-center">
new offer{{ numNewOffersToUser === 1 ? "" : "s" }} to you
</p>
</div>
<div
v-if="numNewOffersToUserProjects"
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
>
<span
class="block text-center text-6xl"
data-testId="newOffersToUserProjectsActivityNumber"
>
{{ numNewOffersToUserProjects
}}{{ newOffersToUserProjectsHitLimit ? "+" : "" }}
</span>
<p class="text-center">
new offer{{ numNewOffersToUserProjects === 1 ? "" : "s" }} to your
projects
</p>
</div>
<div
v-if="numNewStarredProjectChanges"
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
>
<span
class="block text-center text-6xl"
data-testId="newStarredProjectChangesActivityNumber"
>
{{ numNewStarredProjectChanges
}}{{ newStarredProjectChangesHitLimit ? "+" : "" }}
</span>
<p class="text-center">
starred project{{ numNewStarredProjectChanges === 1 ? "" : "s" }}
with changes
</p>
</div>
<p class="text-center text-sm">{{ tile.label }}</p>
</router-link>
</div>
<div class="flex justify-end mt-2">
<button class="text-blue-500">View All New Activity For You</button>
<router-link
:to="{ name: 'new-activity' }"
class="text-blue-500"
data-testId="viewAllNewActivity"
>
View All New Activity For You
</router-link>
</div>
</div>
<InfiniteScroll @reached-bottom="loadMoreGives">
@@ -278,7 +254,7 @@ Raymer * @version 1.0.0 */
<script lang="ts">
import { UAParser } from "ua-parser-js";
import { Component, Vue, Watch } from "vue-facing-decorator";
import { Router } from "vue-router";
import { RouteLocationRaw, Router } from "vue-router";
//import App from "../App.vue";
import EntityIcon from "../components/EntityIcon.vue";
@@ -305,11 +281,21 @@ import {
didInfoForContact,
fetchEndorserRateLimits,
getHeaders,
getNewOffersToUser,
getNewOffersToUserProjects,
getStarredProjectsWithChanges,
getPlanFromCache,
} from "../libs/endorserServer";
import {
NEW_ACTIVITY_BUCKETS,
NEW_ACTIVITY_BUCKET_INFO,
type NewActivityBucket,
parseNewActivityCursorState,
serializeNewActivityCursorState,
} from "../libs/newActivity";
import {
countUnseenActivity,
seedIfNeeded,
type UnseenCounts,
} from "../services/newActivity";
import { buildNewActivityContext } from "../services/newActivityContext";
import {
retrieveAccountDids,
GiverReceiverInputInfo,
@@ -324,7 +310,6 @@ import { NOTIFY_CONTACT_LOADING_ISSUE } from "@/constants/notifications";
import * as Package from "../../package.json";
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
import { errorStringForLog } from "../libs/endorserServer";
import * as databaseUtil from "../db/databaseUtil";
// consolidate this with GiveActionClaim in src/interfaces/claims.ts
interface Claim {
@@ -435,17 +420,10 @@ export default class HomeView extends Vue {
isFeedFilteredByNearby = false;
isFeedLoading = true;
isRegistered = false;
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
lastAckedStarredPlanChangesJwtId?: string; // the last JWT ID for starred project changes that they've acknowledged seeing
newOffersToUserHitLimit: boolean = false;
newOffersToUserProjectsHitLimit: boolean = false;
newStarredProjectChangesHitLimit: boolean = false;
numNewOffersToUser: number = 0; // number of new offers-to-user
numNewOffersToUserProjects: number = 0; // number of new offers-to-user's-projects
numNewStarredProjectChanges: number = 0; // number of new starred project changes
starredPlanHandleIds: Array<string> = []; // list of starred project IDs
// what each New Activity list holds that the person hasn't seen
newActivityCounts: UnseenCounts | null = null;
// the New Activity load finished (and stored any first start), for tests
newActivityLoaded = false;
searchBoxes: Array<{
name: string;
bbox: BoundingBox;
@@ -461,8 +439,8 @@ export default class HomeView extends Vue {
* CRITICAL VUE REACTIVITY BUG WORKAROUND
*
* This watcher is required for the component to render correctly.
* Without it, the newDirectOffersActivityNumber element fails to render
* even when numNewOffersToUser has the correct value.
* Without it, the new-activity number tiles failed to render even when
* their count (then `numNewOffersToUser`) had the correct value.
*
* This appears to be a Vue reactivity issue where property changes
* don't trigger proper template updates.
@@ -471,28 +449,53 @@ export default class HomeView extends Vue {
*
* See: doc/activeDid-migration-plan.md for details
*/
@Watch("numNewOffersToUser")
onNumNewOffersToUserChange(newValue: number, oldValue: number) {
logger.debug("[HomeView] numNewOffersToUser changed", {
oldValue,
newValue,
willRender: !!newValue,
vIfCondition: `v-if="numNewOffersToUser"`,
elementTestId: "newDirectOffersActivityNumber",
shouldShowElement: newValue > 0,
@Watch("newActivityCounts")
onNewActivityCountsChange(newValue: UnseenCounts | null) {
logger.debug("[HomeView] newActivityCounts changed", {
buckets: newValue?.buckets,
errors: newValue?.errors,
timestamp: new Date().toISOString(),
});
}
// get shouldShowNewOffersToUser() {
// const shouldShow = !!this.numNewOffersToUser;
// logger.debug("[HomeView] shouldShowNewOffersToUser computed", {
// numNewOffersToUser: this.numNewOffersToUser,
// shouldShow,
// timestamp: new Date().toISOString()
// });
// return shouldShow;
// }
/**
* One tile per New Activity list with something unseen, in the summary's
* order, each opening that list.
*/
get newActivityTiles(): Array<{
bucket: NewActivityBucket;
count: number;
hitLimit: boolean;
label: string;
colorClass: string;
route: RouteLocationRaw;
}> {
const buckets = this.newActivityCounts?.buckets ?? {};
return NEW_ACTIVITY_BUCKETS.flatMap((bucket) => {
const counted = buckets[bucket];
if (!counted || counted.count === 0) return [];
const info = NEW_ACTIVITY_BUCKET_INFO[bucket];
return [
{
bucket,
count: counted.count,
hitLimit: counted.hitLimit,
label: info.label(counted.count),
colorClass:
info.needs === "none" && info.server === "endorser"
? "from-green-400 to-green-700"
: info.needs === "starred"
? "from-blue-400 to-blue-700"
: "from-slate-400 to-slate-700",
route: {
name: "new-activity-bucket",
params: { bucket },
query: { expected: String(counted.count) },
},
},
];
});
}
/**
* Initializes notification helpers
@@ -526,34 +529,13 @@ export default class HomeView extends Vue {
// Settings already loaded in initializeIdentity()
// Contacts already loaded in initializeIdentity()
// Registration check already handled in initializeIdentity()
await this.loadFeedData();
logger.debug("[HomeView] mounted() - about to call loadNewOffers()", {
timestamp: new Date().toISOString(),
activeDid: this.activeDid,
hasActiveDid: !!this.activeDid,
});
await this.loadNewOffers();
logger.debug("[HomeView] mounted() - loadNewOffers() completed", {
timestamp: new Date().toISOString(),
numNewOffersToUser: this.numNewOffersToUser,
numNewOffersToUserProjects: this.numNewOffersToUserProjects,
shouldShowElement:
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
});
await this.loadNewStarredProjectChanges();
// in parallel, so a first visit records where New Activity starts even
// when the person leaves before the feed finishes
await Promise.all([this.loadFeedData(), this.loadNewActivityCounts()]);
logger.debug("[HomeView] mounted() - component lifecycle completed", {
timestamp: new Date().toISOString(),
finalState: {
numNewOffersToUser: this.numNewOffersToUser,
numNewOffersToUserProjects: this.numNewOffersToUserProjects,
shouldShowElement:
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
},
newActivityTiles: this.newActivityTiles.length,
});
// Add scroll listener for button collapse
@@ -684,17 +666,8 @@ export default class HomeView extends Vue {
this.isFeedFilteredByVisible = !!settings.filterFeedByVisible;
this.isFeedFilteredByNearby = !!settings.filterFeedByNearby;
this.isRegistered = !!settings.isRegistered;
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId;
this.lastAckedOfferToUserProjectsJwtId =
settings.lastAckedOfferToUserProjectsJwtId;
this.lastAckedStarredPlanChangesJwtId =
settings.lastAckedStarredPlanChangesJwtId;
this.searchBoxes = settings.searchBoxes || [];
this.showShortcutBvc = !!settings.showShortcutBvc;
this.starredPlanHandleIds = databaseUtil.parseJsonField(
settings.starredPlanHandleIds,
[],
);
this.isAnyFeedFilterOn = checkIsAnyFeedFilterOn(settings);
// Check registration status if needed
@@ -794,155 +767,52 @@ export default class HomeView extends Vue {
}
/**
* Loads new offers for user and their projects
* Updates:
* - Number of new direct offers
* - Number of new project offers
* - Rate limit status for both
* Loads the New Activity counts the Home tiles show: for each list, what
* came after the person last looked at it or at the New Activity summary.
* The first load ever only records where to start (`seedIfNeeded`), so it
* shows no tiles. Failures are logged and leave the tiles empty; the summary shows them.
*
* @internal
* @requires Active DID
*/
private async loadNewOffers() {
logger.debug("[HomeView] loadNewOffers() called with activeDid:", {
activeDid: this.activeDid,
hasActiveDid: !!this.activeDid,
length: this.activeDid?.length || 0,
});
if (this.activeDid) {
logger.debug(
"[HomeView] loadNewOffers() - activeDid found, calling API",
{
activeDid: this.activeDid,
apiServer: this.apiServer,
isRegistered: this.isRegistered,
lastAckedOfferToUserJwtId: this.lastAckedOfferToUserJwtId,
},
);
try {
const offersToUserData = await getNewOffersToUser(
this.axios,
this.apiServer,
this.activeDid,
this.lastAckedOfferToUserJwtId,
);
logger.debug(
"[HomeView] loadNewOffers() - getNewOffersToUser successful",
{
activeDid: this.activeDid,
dataLength: offersToUserData.data.length,
hitLimit: offersToUserData.hitLimit,
},
);
this.numNewOffersToUser = offersToUserData.data.length;
this.newOffersToUserHitLimit = offersToUserData.hitLimit;
logger.debug("[HomeView] loadNewOffers() - updated component state", {
activeDid: this.activeDid,
numNewOffersToUser: this.numNewOffersToUser,
newOffersToUserHitLimit: this.newOffersToUserHitLimit,
willRender: !!this.numNewOffersToUser,
timestamp: new Date().toISOString(),
});
const offersToUserProjects = await getNewOffersToUserProjects(
this.axios,
this.apiServer,
this.activeDid,
this.lastAckedOfferToUserProjectsJwtId,
);
logger.debug(
"[HomeView] loadNewOffers() - getNewOffersToUserProjects successful",
{
activeDid: this.activeDid,
dataLength: offersToUserProjects.data.length,
hitLimit: offersToUserProjects.hitLimit,
},
);
this.numNewOffersToUserProjects = offersToUserProjects.data.length;
this.newOffersToUserProjectsHitLimit = offersToUserProjects.hitLimit;
logger.debug("[HomeView] loadNewOffers() - all API calls completed", {
numNewOffersToUser: this.numNewOffersToUser,
numNewOffersToUserProjects: this.numNewOffersToUserProjects,
shouldRenderElement: !!this.numNewOffersToUser,
elementTestId: "newDirectOffersActivityNumber",
timestamp: new Date().toISOString(),
});
// Additional logging for template rendering debugging
logger.debug("[HomeView] loadNewOffers() - template rendering check", {
numNewOffersToUser: this.numNewOffersToUser,
numNewOffersToUserProjects: this.numNewOffersToUserProjects,
totalNewOffers:
this.numNewOffersToUser + this.numNewOffersToUserProjects,
shouldShowElement:
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
vIfCondition: `v-if="numNewOffersToUser + numNewOffersToUserProjects"`,
elementWillRender:
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
timestamp: new Date().toISOString(),
});
} catch (error) {
logger.error("[HomeView] loadNewOffers() - API call failed", {
activeDid: this.activeDid,
apiServer: this.apiServer,
isRegistered: this.isRegistered,
error: errorStringForLog(error),
errorMessage: error instanceof Error ? error.message : String(error),
});
}
} else {
logger.warn("[HomeView] loadNewOffers() - no activeDid available", {
activeDid: this.activeDid,
timestamp: new Date().toISOString(),
});
private async loadNewActivityCounts() {
if (!this.activeDid) {
this.newActivityCounts = null;
this.newActivityLoaded = true;
return;
}
}
/**
* Loads new changes for starred projects
* Updates:
* - Number of new starred project changes
* - Rate limit status for starred project changes
*
* @internal
* @requires Active DID
*/
private async loadNewStarredProjectChanges() {
if (this.activeDid && this.starredPlanHandleIds.length > 0) {
try {
const starredProjectChanges = await getStarredProjectsWithChanges(
this.axios,
this.apiServer,
this.activeDid,
this.starredPlanHandleIds,
this.lastAckedStarredPlanChangesJwtId,
);
// filter out any data elements where there is no wrappedClaimBefore
const filteredNewStarredProjectChanges =
starredProjectChanges.data.filter(
(change) => change.wrappedClaimBefore !== undefined,
);
this.numNewStarredProjectChanges =
filteredNewStarredProjectChanges.length;
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
} catch (error) {
// Don't show errors for starred project changes as it's a secondary feature
logger.warn(
"[HomeView] Failed to load starred project changes:",
error,
);
this.numNewStarredProjectChanges = 0;
this.newStarredProjectChangesHitLimit = false;
try {
const settings = await this.$accountSettings();
const context = buildNewActivityContext(
this.axios,
this.activeDid,
settings,
);
const { state, seeded } = await seedIfNeeded(
context,
parseNewActivityCursorState(settings.newActivityCursors),
new Date(),
);
if (seeded) {
await this.$saveUserSettings(this.activeDid, {
newActivityCursors: serializeNewActivityCursorState(state),
});
}
} else {
this.numNewStarredProjectChanges = 0;
this.newStarredProjectChangesHitLimit = false;
this.newActivityCounts = await countUnseenActivity(context, state);
if (this.newActivityCounts.errors.length > 0) {
logger.warn(
"[HomeView] Some New Activity counts failed:",
this.newActivityCounts.errors,
);
}
} catch (error) {
logger.error("[HomeView] Failed to load New Activity counts:", {
activeDid: this.activeDid,
error: errorStringForLog(error),
});
this.newActivityCounts = null;
} finally {
this.newActivityLoaded = true;
}
}
@@ -1665,16 +1535,6 @@ export default class HomeView extends Vue {
}
}
/**
* Navigates to activity page
*
* @public
* Called by template click handler
*/
goToActivityToUserPage() {
this.$router.push({ name: "new-activity" });
}
/**
* Navigates to claim details page
*
+452
View File
@@ -0,0 +1,452 @@
<template>
<QuickNav selected="Home"></QuickNav>
<section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
<!-- Sub View Heading -->
<div id="SubViewHeading" class="flex gap-4 items-start mb-4">
<h1 class="grow text-xl text-center font-semibold leading-tight">
<span v-if="!loading" data-testId="newActivityBucketCount"
>{{ rows.length }}{{ hasMore ? "+" : "" }}</span
>
{{ info ? info.label(rows.length) : "New Activity" }}
</h1>
<!-- Back -->
<a
class="order-first text-lg text-center leading-none p-1"
@click="$router.go(-1)"
>
<font-awesome icon="chevron-left" class="block text-center w-[1em]" />
</a>
</div>
<p v-if="info" class="text-sm text-slate-600 text-center mb-4">
{{ info.description }}
</p>
<p
v-if="countNote"
class="mb-4 text-sm bg-amber-100 rounded px-3 py-2"
data-testId="newActivityBucketCountNote"
>
{{ countNote }}
</p>
<p v-if="serverMessage" class="mb-4 text-sm bg-slate-100 rounded px-3 py-2">
{{ serverMessage }}
</p>
<div v-if="loading" class="text-center text-slate-500">
<font-awesome icon="spinner" class="fa-spin-pulse" /> Loading...
</div>
<template v-else>
<p v-if="rows.length === 0" class="text-center text-slate-500 my-4">
Nothing new here.
</p>
<ul
class="border-t border-slate-300"
:data-testId="'newActivityBucketList-' + bucket"
>
<li
v-for="(row, index) in rows"
:key="rowKey(row, index)"
class="border-b border-slate-300 py-3"
>
<NewActivityRow
:bucket="bucket"
:row="row"
:active-did="activeDid"
:all-my-dids="allMyDids"
:all-contacts="allContacts"
:plan-change="planChangeFor(row)"
/>
</li>
</ul>
<div class="flex justify-center gap-4 mt-4">
<button
v-if="hasMore"
class="text-blue-500"
:disabled="loadingMore"
@click="loadMore()"
>
Show more
</button>
</div>
<p v-if="earlierRows.length > 0" class="mt-6 mb-2 font-medium">
Already seen
</p>
<ul v-if="earlierRows.length > 0" class="border-t border-slate-300">
<li
v-for="(row, index) in earlierRows"
:key="'earlier-' + rowKey(row, index)"
class="border-b border-slate-300 py-3 text-slate-600"
>
<NewActivityRow
:bucket="bucket"
:row="row"
:active-did="activeDid"
:all-my-dids="allMyDids"
:all-contacts="allContacts"
/>
</li>
</ul>
<div class="flex justify-center mt-4">
<button
v-if="earlierCursor && earlierHasMore"
class="text-blue-500"
:disabled="loadingMore"
@click="loadEarlier()"
>
Show earlier
</button>
</div>
<div class="mt-8 text-sm">
<router-link
v-if="bucket === 'claims'"
to="/recent-offers-to-user"
class="text-blue-500"
>
See all recent offers to you
</router-link>
<router-link
v-if="bucket === 'personalPlanContributions'"
to="/recent-offers-to-user-projects"
class="text-blue-500"
>
See all recent offers to your projects
</router-link>
</div>
</template>
</section>
</template>
<script lang="ts">
import { Component, Vue } from "vue-facing-decorator";
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
import NewActivityRow from "../components/NewActivityRow.vue";
import QuickNav from "../components/QuickNav.vue";
import { NotificationIface } from "../constants/app";
import { Contact } from "../db/tables/contacts";
import { Settings } from "../db/tables/settings";
import { PlanSummaryAndPreviousClaim } from "../interfaces/records";
import { getStarredProjectsWithChanges } from "../libs/endorserServer";
import {
isNewActivityBucket,
NEW_ACTIVITY_BUCKET_INFO,
NewActivityBucket,
NewActivityBucketInfo,
parseNewActivityCursorState,
serializeNewActivityCursorState,
ulidJustBefore,
windowStart,
} from "../libs/newActivity";
import { retrieveAccountDids } from "../libs/util";
import {
loadBucket,
loadBucketEarlier,
NewActivityContext,
seedIfNeeded,
} from "../services/newActivity";
import { buildNewActivityContext } from "../services/newActivityContext";
import { logger } from "../utils/logger";
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
import { createNotifyHelpers } from "@/utils/notify";
/** The largest of some IDs, which for ULIDs is the newest. */
function newestId(ids: Array<string | undefined>): string | undefined {
return ids
.filter((id): id is string => !!id)
.sort()
.pop();
}
/**
* One New Activity bucket: every row since this bucket was last opened, with
* its exact count. Opening it marks the bucket read.
*/
@Component({
components: { NewActivityRow, QuickNav },
mixins: [PlatformServiceMixin],
})
export default class NewActivityBucketView extends Vue {
$notify!: (notification: NotificationIface, timeout?: number) => void;
$route!: RouteLocationNormalizedLoaded;
$router!: Router;
notify!: ReturnType<typeof createNotifyHelpers>;
activeDid = "";
allContacts: Contact[] = [];
allMyDids: string[] = [];
bucket: NewActivityBucket = "claims";
context?: NewActivityContext;
countNote = "";
earlierCursor: string | undefined = undefined;
earlierHasMore = true;
earlierRows: unknown[] = [];
hasMore = false;
info: NewActivityBucketInfo | null = null;
loading = true;
loadingMore = false;
nextAfterCursor: string | undefined = undefined;
planChanges: Record<string, PlanSummaryAndPreviousClaim> = {};
rows: unknown[] = [];
serverMessage = "";
settings: Settings = {};
async created() {
this.notify = createNotifyHelpers(this.$notify);
const bucket = this.$route.params.bucket;
if (!isNewActivityBucket(bucket)) {
this.loading = false;
this.notify.error("That is not a kind of new activity.");
return;
}
this.bucket = bucket;
this.info = NEW_ACTIVITY_BUCKET_INFO[bucket];
try {
this.settings = await this.$accountSettings();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const activeIdentity = await (this as any).$getActiveIdentity();
this.activeDid = activeIdentity.activeDid || "";
this.allContacts = await this.$getAllContacts();
this.allMyDids = await retrieveAccountDids();
const context = buildNewActivityContext(
this.axios,
this.activeDid,
this.settings,
);
this.context = context;
const now = new Date();
const server = this.info.server;
const { state, seeded } = await seedIfNeeded(
context,
parseNewActivityCursorState(this.settings.newActivityCursors),
now,
);
if (seeded) {
await this.$saveUserSettings(this.activeDid, {
newActivityCursors: serializeNewActivityCursorState(state),
});
}
const bucketWindow = state.buckets?.[bucket];
// from where this list last ended, so what it showed then stays read;
// a bucket never opened starts where the summary does
const from = bucketWindow
? bucketWindow.to
: windowStart(state.visit, now)?.[server];
const page = await loadBucket(context, bucket, from);
this.rows = page.rows;
this.hasMore = page.hasMore;
this.nextAfterCursor = page.nextAfterCursor;
this.serverMessage = page.userMessage || "";
// with no start (seeding failed), earlier rows end where this load did
this.earlierCursor = from ?? page.nextAfterCursor;
this.explainCount();
await this.loadPlanChanges();
this.loading = false;
if (page.nextAfterCursor) {
const window = {
...(from ? { from } : {}),
...(bucketWindow?.seenAt ? { fromSeenAt: bucketWindow.seenAt } : {}),
to: page.nextAfterCursor,
at: now.toISOString(),
seenAt: now.toISOString(),
};
// re-read: the summary may have saved the visit meanwhile
const latest = parseNewActivityCursorState(
(await this.$accountSettings()).newActivityCursors,
);
await this.$saveUserSettings(this.activeDid, {
newActivityCursors: serializeNewActivityCursorState({
...latest,
buckets: { ...latest.buckets, [bucket]: window },
}),
...this.legacyReadMarkers(),
});
}
} catch (err: unknown) {
logger.error("[NewActivityBucketView] Error loading:", err);
this.loading = false;
this.notify.error(
(err as Error)?.message ||
"There was an error retrieving this activity.",
);
}
}
/** Compare with the count the summary showed, and say why they differ. */
explainCount(): void {
const expectedText = this.$route.query.expected as string | undefined;
if (expectedText === undefined || this.hasMore) return;
const expected = Number(expectedText);
if (Number.isNaN(expected) || expected === this.rows.length) return;
if (this.rows.length > expected) {
const earlier = this.rows.length - expected;
this.countNote =
`${earlier} of these came before the count you tapped started, ` +
"on an earlier visit to New Activity or to this list.";
} else {
this.countNote =
"This is fewer than the count you tapped: you opened this list " +
"since then, or some items are no longer visible to you.";
}
}
/**
* The read markers the Recent Offers pages mark the last-read offer with,
* moved to the newest offer on this page.
*/
legacyReadMarkers(): Partial<Settings> {
const rows = this.rows as Array<Record<string, string | undefined>>;
if (this.bucket === "claims") {
const newest = newestId(
rows
.filter(
(r) => r.claimType === "Offer" && r.toEntity === this.activeDid,
)
.map((r) => r.id),
);
return newest && newest > (this.settings.lastAckedOfferToUserJwtId || "")
? { lastAckedOfferToUserJwtId: newest }
: {};
}
if (this.bucket === "personalPlanContributions") {
const newest = newestId(
rows.filter((r) => r.claimType === "Offer").map((r) => r.id),
);
return newest &&
newest > (this.settings.lastAckedOfferToUserProjectsJwtId || "")
? { lastAckedOfferToUserProjectsJwtId: newest }
: {};
}
if (this.bucket === "trackedPlanUpdates") {
const newest = newestId(rows.map((r) => r.jwtId));
return newest &&
newest > (this.settings.lastAckedStarredPlanChangesJwtId || "")
? { lastAckedStarredPlanChangesJwtId: newest }
: {};
}
return {};
}
/**
* For starred-project edits, the claim before the earliest edit on this
* page, so each row can show what changed.
*/
async loadPlanChanges(): Promise<void> {
if (this.bucket !== "trackedPlanUpdates" || !this.context) return;
const rows = this.rows as Array<{ handleId?: string; jwtId?: string }>;
const oldest = rows
.map((r) => r.jwtId)
.filter((id): id is string => !!id)
.sort()[0];
const afterId = oldest ? ulidJustBefore(oldest) : undefined;
const handleIds = rows
.map((r) => r.handleId)
.filter((id): id is string => !!id);
if (!afterId || handleIds.length === 0) return;
try {
const result = await getStarredProjectsWithChanges(
this.axios,
this.context.endorserServer,
this.activeDid,
handleIds,
afterId,
);
const byHandle: Record<string, PlanSummaryAndPreviousClaim> = {};
for (const change of result.data) {
byHandle[change.plan.handleId] = change;
}
this.planChanges = byHandle;
} catch (error) {
logger.warn("[NewActivityBucketView] No previous project claims:", error);
}
}
planChangeFor(row: unknown): PlanSummaryAndPreviousClaim | undefined {
if (this.bucket !== "trackedPlanUpdates") return undefined;
const handleId = (row as { handleId?: string }).handleId;
return handleId ? this.planChanges[handleId] : undefined;
}
async loadMore(): Promise<void> {
if (!this.context || !this.nextAfterCursor) return;
this.loadingMore = true;
try {
const page = await loadBucket(
this.context,
this.bucket,
this.nextAfterCursor,
);
this.rows = [...this.rows, ...page.rows];
this.hasMore = page.hasMore;
if (page.nextAfterCursor) {
this.nextAfterCursor = page.nextAfterCursor;
const latest = parseNewActivityCursorState(
(await this.$accountSettings()).newActivityCursors,
);
const window = latest.buckets?.[this.bucket];
if (window) {
await this.$saveUserSettings(this.activeDid, {
newActivityCursors: serializeNewActivityCursorState({
...latest,
buckets: {
...latest.buckets,
[this.bucket]: {
...window,
to: page.nextAfterCursor,
seenAt: new Date().toISOString(),
},
},
}),
});
}
}
} catch (err: unknown) {
logger.error("[NewActivityBucketView] Error loading more:", err);
this.notify.error("Could not load more. Please try again.");
} finally {
this.loadingMore = false;
}
}
async loadEarlier(): Promise<void> {
if (!this.context || !this.earlierCursor) return;
this.loadingMore = true;
try {
const page = await loadBucketEarlier(
this.context,
this.bucket,
this.earlierCursor,
);
this.earlierRows = [...this.earlierRows, ...page.rows];
this.earlierCursor = page.nextBeforeCursor;
this.earlierHasMore = page.hasMore;
} catch (err: unknown) {
logger.error("[NewActivityBucketView] Error loading earlier:", err);
this.notify.error("Could not load earlier items. Please try again.");
} finally {
this.loadingMore = false;
}
}
rowKey(row: unknown, index: number): string {
const record = row as Record<string, unknown>;
const inner = (record.profile ?? record.plan ?? record) as Record<
string,
unknown
>;
const id = inner.id ?? inner.jwtId ?? inner.rowId ?? inner.handleId;
return id !== undefined ? String(id) : String(index);
}
}
</script>
File diff suppressed because it is too large Load Diff
+5
View File
@@ -28,6 +28,11 @@
</router-link>
</div>
<div v-if="message" class="mb-4 text-sm bg-slate-100 rounded px-3 py-2">
<font-awesome icon="circle-info" class="fa-fw text-slate-500" />
{{ message }}
</div>
<h1 class="text-xl font-bold text-center mb-4">
<span> Offer to {{ recipientDisplayName }} </span>
</h1>
+1
View File
@@ -1492,6 +1492,7 @@ export default class ProjectViewView extends Vue {
this.allContacts,
this.activeDid,
this.allMyDids,
this.jwtId,
);
}
+12
View File
@@ -136,6 +136,7 @@ import {
} from "../constants/app";
import { accessToken } from "../libs/crypto";
import { base64ToBlob, SHARED_PHOTO_BASE64_KEY } from "../libs/util";
import { takeWebSharedPhoto } from "../libs/webShareTarget";
import { logger } from "../utils/logger";
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
@@ -221,6 +222,17 @@ export default class SharedPhotoView extends Vue {
const activeIdentity = await (this as any).$getActiveIdentity();
this.activeDid = activeIdentity.activeDid;
// Web Share Target: public/sw.js stashes the photo in Cache Storage
if (this.$route.query["source"] === "share-target") {
const shared = await takeWebSharedPhoto();
if (shared) {
this.imageBlob = shared.blob;
this.imageFileName = shared.fileName;
return;
}
}
// Native share: main.capacitor.ts stores the photo in the temp table
const temp = await this.$getTemp(SHARED_PHOTO_BASE64_KEY);
const imageB64 = temp?.blobB64 as string;
if (temp) {
+18 -1
View File
@@ -32,7 +32,15 @@
<!-- Startup error: recovery options instead of identity creation -->
<div v-if="startupError" class="max-w-3xl mx-auto">
<div class="p-4 bg-red-50 border border-red-300 rounded-lg">
<p class="text-red-800">
<p v-if="webAssemblyUnavailable" class="text-red-800">
This browser could not run WebAssembly, which the app needs to open
its data. Try Again first, since this is sometimes temporary. If it
keeps happening, a privacy or security setting is probably blocking it
(such as Tor Browser's "Safest" level, Apple's Lockdown Mode, or a
strict security mode in Edge): allow this site in that setting, or use
another browser.
</p>
<p v-else class="text-red-800">
The app could not open its data on this device, so nothing else will
work until this is fixed. Reinstalling usually does not help, because
the phone restores the same data from its backup.
@@ -297,6 +305,15 @@ export default class StartView extends Vue {
].join("\n\n");
}
/**
* The web database (sql.js) needs WebAssembly; browsers report its absence
* as, for example, "no WebAssembly compiler available" (Firefox) or
* "WebAssembly is not defined".
*/
get webAssemblyUnavailable(): boolean {
return /WebAssembly/i.test(this.startupError);
}
get supportMailto(): string {
// Mail apps truncate long mailto links; Copy Details carries the full text.
const body = this.errorReport.slice(0, 1800);
+17 -290
View File
@@ -54,151 +54,20 @@
</p>
</div>
<!--
Network Connections section: shows nearest neighbors in the registration
graph for this user profile. The same conventions and styling are used in
ClaimView.vue for claim-level nearest neighbors. Keep changes in sync.
-->
<div
v-if="
profile.issuerDid !== activeDid && // only show neighbors if they're not current user
profile.issuerDid !== neighbors?.[0]?.did // and they're not directly connected
// (which we know because there is no neighbor in-between them)
"
<NetworkConnections
v-if="activeDid && profile.issuerDid !== activeDid"
class="mt-6"
>
<h2 class="text-lg font-semibold mb-3">
Network Connections
<button
title="What is this?"
class="ml-1 align-middle"
@click="showNeighborsInfo = true"
>
<font-awesome
icon="circle-info"
class="text-base text-blue-500 cursor-pointer"
/>
</button>
</h2>
<!-- Info modal for network connections explanation -->
<div
v-if="showNeighborsInfo"
class="fixed inset-0 bg-black bg-opacity-50 flex items-start justify-center pt-16 z-50"
@click.self="showNeighborsInfo = false"
>
<div class="bg-white rounded-lg p-6 mx-4 max-w-md">
<h3 class="text-lg font-semibold mb-2">Network Connections</h3>
<p class="text-sm text-slate-700">
This section shows
{{
neighbors.length === 1
? "a contact that is"
: "contacts that are"
}}
nearer to this person. If you want more information, reach out to
one of them and ask for an introduction.
</p>
<button
class="mt-4 w-full bg-blue-600 text-white py-2 rounded-md"
@click="showNeighborsInfo = false"
>
Got it
</button>
</div>
</div>
<div v-if="loadingNeighbors">
<div class="flex justify-center items-center py-8">
<font-awesome
icon="spinner"
class="fa-spin-pulse text-2xl text-slate-400"
/>
</div>
</div>
<div
v-else-if="neighborsError"
class="bg-red-50 border border-red-300 rounded-md p-4"
>
<div class="flex items-start gap-2">
<font-awesome
icon="exclamation-triangle"
class="text-red-500 mt-0.5"
/>
<p class="text-red-700">{{ neighborsError }}</p>
</div>
</div>
<div v-else>
<div class="space-y-2">
<div
v-for="neighbor in neighbors"
:key="neighbor.did"
class="bg-slate-50 border border-slate-300 rounded-md"
>
<div class="flex items-center justify-between gap-3 p-3">
<div class="flex items-center gap-2 flex-1 min-w-0">
<button
title="Copy profile link and expand"
class="text-blue-600 flex-shrink-0"
@click="onNeighborExpandClick(neighbor.did)"
>
<font-awesome
:icon="
expandedNeighborDid === neighbor.did
? 'chevron-down'
: 'chevron-right'
"
class="text-sm"
/>
{{ getNeighborDisplayName(neighbor.did) }}
</button>
<span :class="getRelationBadgeClass(neighbor.relation)">
{{ getRelationLabel(neighbor.relation) }}
</span>
</div>
</div>
<div
v-if="expandedNeighborDid === neighbor.did"
class="border-t border-slate-300 p-3 bg-white"
>
<router-link
:to="{ name: 'did', params: { did: neighbor.did } }"
class="text-blue-600 hover:text-blue-800 font-medium underline"
>
Go to contact info
</router-link>
and send them the profile link from your clipboard. Ask them to
introduce you to this person.
<div
v-if="
getNeighborDisplayName(neighbor.did) === '' ||
neighborIsNotInContacts(neighbor.did)
"
class="flex flex-col gap-1 mt-2"
>
<p class="text-xs text-slate-600">
This person is connected to you, but they are not in this
device's contacts. Copy this DID link and check on another
device or check with different people.
</p>
<span class="flex items-center gap-1 min-w-0">
<span class="text-xs truncate text-slate-600 min-w-0">
{{ neighbor.did }}
</span>
<button
title="Copy DID Link"
class="text-blue-600 hover:text-blue-800 underline cursor-pointer flex-shrink-0"
@click.prevent="onCopyDidClick(neighbor.did)"
>
<font-awesome icon="copy" class="text-sm" />
</button>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
:active-did="activeDid"
:all-contacts="allContacts"
:all-my-dids="allMyDids"
:api-server="partnerApiServer"
:is-registered="isRegistered"
:link="`${APP_SERVER}/deep-link/user-profile/${profile.rowId}`"
link-name="Profile link"
:profile-did="profile.issuerDid"
:profile-id="profile.rowId"
subject-description="this person"
/>
<!-- Map for first coordinates -->
<div v-if="hasFirstLocation" class="mt-4">
@@ -251,6 +120,7 @@ import { Component, Vue } from "vue-facing-decorator";
import { LMap, LTileLayer, LMarker, LPopup } from "@vue-leaflet/vue-leaflet";
import { Router, RouteLocationNormalizedLoaded } from "vue-router";
import NetworkConnections from "../components/NetworkConnections.vue";
import QuickNav from "../components/QuickNav.vue";
import TopMessage from "../components/TopMessage.vue";
import {
@@ -290,6 +160,7 @@ import { NOTIFY_PROFILE_LOAD_ERROR } from "@/constants/notifications";
LMarker,
LPopup,
LTileLayer,
NetworkConnections,
QuickNav,
TopMessage,
},
@@ -305,14 +176,10 @@ export default class UserProfileView extends Vue {
activeDid = "";
allContacts: Array<Contact> = [];
allMyDids: Array<string> = [];
expandedNeighborDid: string | null = null;
isLoading = true;
loadingNeighbors = false;
neighbors: Array<{ did: string; relation: string }> = [];
neighborsError = "";
isRegistered = false;
partnerApiServer = DEFAULT_PARTNER_API_SERVER;
profile: UserProfile | null = null;
showNeighborsInfo = false;
// make this function available to the Vue template
didInfo = didInfo;
@@ -335,7 +202,6 @@ export default class UserProfileView extends Vue {
async mounted() {
await this.initializeSettings();
await this.loadProfile();
await this.loadNeighbors();
}
/**
@@ -350,6 +216,7 @@ export default class UserProfileView extends Vue {
this.activeDid = activeIdentity.activeDid || "";
this.partnerApiServer = settings.partnerApiServer || this.partnerApiServer;
this.isRegistered = !!settings.isRegistered;
this.allContacts = await this.$getAllContacts();
this.allMyDids = await retrieveAccountDids();
@@ -394,48 +261,6 @@ export default class UserProfileView extends Vue {
}
}
/**
* Loads nearest neighbors from partner API
*
* Fetches network connections for the profile and displays them
* with appropriate relation labels
*/
async loadNeighbors() {
const profileId: string = this.$route.params.id as string;
if (!profileId) {
return;
}
this.loadingNeighbors = true;
this.neighborsError = "";
try {
const response = await fetch(
`${this.partnerApiServer}/api/partner/userProfileNearestNeighbors/${encodeURIComponent(profileId)}`,
{
method: "GET",
headers: await getHeaders(this.activeDid),
},
);
if (response.status === 200) {
const result = await response.json();
this.neighbors = result.data;
this.neighborsError = "";
} else {
logger.warn("Failed to load neighbors:", response.status);
this.neighbors = [];
this.neighborsError = "Failed to load network connections.";
}
} catch (error) {
logger.error("Error loading neighbors:", error);
this.neighbors = [];
this.neighborsError =
"An error occurred while loading network connections.";
} finally {
this.loadingNeighbors = false;
}
}
/**
* Copies a deep link to the profile to the clipboard
*/
@@ -450,45 +275,6 @@ export default class UserProfileView extends Vue {
}
}
/**
* Copies a deep link to the provided DID to the clipboard
*/
async onCopyDidClick(did: string) {
const deepLink = `${APP_SERVER}/deep-link/did/${encodeURIComponent(did)}`;
try {
await copyToClipboard(deepLink);
this.notify.copied("DID link", TIMEOUTS.STANDARD);
} catch (error) {
this.$logAndConsole(`Error copying DID link: ${error}`, true);
this.notify.error("Failed to copy DID link.");
}
}
/**
* Handles clicking the expand button next to a neighbor's name
* Copies the profile link to clipboard and toggles the expanded section
*/
async onNeighborExpandClick(did: string) {
if (this.expandedNeighborDid === did) {
this.expandedNeighborDid = null;
// don't copy the link
return;
}
// Copy the profile link
const deepLink = `${APP_SERVER}/deep-link/user-profile/${this.profile?.rowId}`;
try {
await copyToClipboard(deepLink);
this.notify.copied("Profile link", TIMEOUTS.STANDARD);
} catch (error) {
this.$logAndConsole(`Error copying profile link: ${error}`, true);
this.notify.error("Failed to copy profile link.");
}
// Toggle the expanded section
this.expandedNeighborDid = did;
}
/**
* Computed properties for template logic streamlining
*/
@@ -553,64 +339,5 @@ export default class UserProfileView extends Vue {
get tileLayerUrl() {
return "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
}
/**
* Gets display name for a neighbor's DID
* Uses didInfo utility to show contact name if available, otherwise DID
* @param did - The DID to get display name for
* @returns Formatted display name
*/
getNeighborDisplayName(did: string): string {
return this.didInfo(did, this.activeDid, this.allMyDids, this.allContacts);
}
neighborIsNotInContacts(did: string) {
return !this.allContacts.some((contact) => contact.did === did);
}
noNeighborsAreInContacts() {
return this.neighbors.every(
(neighbor) =>
!this.allContacts.some((contact) => contact.did === neighbor.did),
);
}
/**
* Gets human-readable label for relation type
* @param relation - The relation type from API
* @returns Display label for the relation
*/
getRelationLabel(relation: string): string {
switch (relation) {
case "REGISTERED_BY_YOU":
return "Registered by You";
case "REGISTERED_YOU":
return "Registered You";
case "TARGET":
return "Yourself";
default:
return relation;
}
}
/**
* Gets CSS classes for relation badge styling
* @param relation - The relation type from API
* @returns CSS class string for badge
*/
getRelationBadgeClass(relation: string): string {
const baseClasses =
"text-xs font-semibold px-2 py-1 rounded whitespace-nowrap";
switch (relation) {
case "REGISTERED_BY_YOU":
return `${baseClasses} bg-blue-100 text-blue-700`;
case "REGISTERED_YOU":
return `${baseClasses} bg-green-100 text-green-700`;
case "TARGET":
return `${baseClasses} bg-purple-100 text-purple-700`;
default:
return `${baseClasses} bg-slate-100 text-slate-700`;
}
}
}
</script>
-55
View File
@@ -1,55 +0,0 @@
import * as path from "path";
import { promises as fs } from "fs";
import { fileURLToPath } from "url";
export async function loadAppConfig() {
const packageJson = await loadPackageJson();
const appName = process.env.TIME_SAFARI_APP_TITLE || packageJson.name;
const __dirname = path.dirname(fileURLToPath(import.meta.url));
return {
pwaConfig: {
manifest: {
name: appName,
short_name: appName,
icons: [
{
src: "./img/icons/android-chrome-192x192.png",
sizes: "192x192",
type: "image/png",
},
{
src: "./img/icons/android-chrome-512x512.png",
sizes: "512x512",
type: "image/png",
},
{
src: "./img/icons/android-chrome-maskable-192x192.png",
sizes: "192x192",
type: "image/png",
purpose: "maskable",
},
{
src: "./img/icons/android-chrome-maskable-512x512.png",
sizes: "512x512",
type: "image/png",
purpose: "maskable",
},
],
},
},
aliasConfig: {
"@": path.resolve(path.dirname(__dirname), "src"),
buffer: path.resolve(path.dirname(__dirname), "node_modules", "buffer"),
"dexie-export-import/dist/import":
"dexie-export-import/dist/import/index.js",
},
};
}
async function loadPackageJson() {
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const packageJsonPath = path.resolve(path.dirname(__dirname), "package.json");
const packageJsonData = await fs.readFile(packageJsonPath, "utf-8");
return JSON.parse(packageJsonData);
}
-1051
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -24,7 +24,7 @@
*
* Related Files:
* - Frontend invite handling: src/libs/endorserServer.ts
* - JWT creation: sw_scripts/safari-notifications.js
* - JWT creation: src/libs/crypto/vc/index.ts
*
* @see Documentation on invitation flows in usage-guide.md
* @requires @playwright/test
@@ -58,7 +58,7 @@
*
* Related Files:
* - Project utilities: ./testUtils
* - JWT handling: sw_scripts/safari-notifications.js
* - JWT handling: src/libs/crypto/vc/index.ts
* - Project view: src/views/ProjectView.vue
*
* @see Documentation in usage-guide.md for project creation workflows
+1 -1
View File
@@ -63,7 +63,7 @@
*
* Related Files:
* - Gift recording view: src/views/RecordGiftView.vue
* - JWT creation: sw_scripts/safari-notifications.js
* - JWT creation: src/libs/crypto/vc/index.ts
* - Endorser API: src/libs/endorserServer.ts
*
* @see Documentation in usage-guide.md for gift recording workflows
+1 -1
View File
@@ -60,7 +60,7 @@
*
* Related Files:
* - Gift recording view: src/views/RecordGiftView.vue
* - JWT creation: sw_scripts/safari-notifications.js
* - JWT creation: src/libs/crypto/vc/index.ts
* - Endorser API: src/libs/endorserServer.ts
* - Test utilities: ./testUtils.ts
*
+3 -4
View File
@@ -165,16 +165,15 @@ test('Add contact, record gift, confirm gift', async ({ page }) => {
await giftLink.click();
// Confirm gift as user 00
await page.getByTestId('confirmGiftLink').click();
await page.getByRole('button', { name: 'Confirm' }).click();
await page.getByRole('button', { name: 'Yes' }).click();
await expect(page.getByText('Confirmation submitted.')).toBeVisible();
await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
// Refresh claim page, Confirm button should throw an alert because they already confirmed
// Refresh claim page, Confirm button should be gone because they already confirmed
await page.reload();
await page.getByRole('button', { name: 'Confirm' }).click();
await expect(page.locator('div[role="alert"]')).toBeVisible();
await expect(page.getByText('You have confirmed this claim.')).toBeVisible();
await expect(page.getByRole('button', { name: 'Confirm' })).toHaveCount(0);
});
test('Without being registered, add contacts without registration', async ({ page, context }) => {

Some files were not shown because too many files have changed in this diff Show More