Compare commits
3 Commits
v1.0.11-p0
...
daily-noti
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8191fb07db | ||
|
|
7725f19387 | ||
| 76b3fa8199 |
20
.github/workflows/ci.yml
vendored
Normal file
20
.github/workflows/ci.yml
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
name: CI
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test-and-smoke:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-node@v4
|
||||||
|
with: { node-version: 20 }
|
||||||
|
- run: npm ci
|
||||||
|
- run: npm run lint
|
||||||
|
- run: npm test --workspaces
|
||||||
|
- name: k6 smoke (poll+ack)
|
||||||
|
uses: grafana/k6-action@v0.3.1
|
||||||
|
with:
|
||||||
|
filename: k6/poll-ack-smoke.js
|
||||||
|
env:
|
||||||
|
API: ${{ secrets.SMOKE_API }}
|
||||||
|
JWT: ${{ secrets.SMOKE_JWT }}
|
||||||
98
.npmignore
98
.npmignore
@@ -1,98 +0,0 @@
|
|||||||
# Dependencies
|
|
||||||
node_modules/
|
|
||||||
|
|
||||||
# Build artifacts
|
|
||||||
dist/
|
|
||||||
build/
|
|
||||||
*.tsbuildinfo
|
|
||||||
|
|
||||||
# Test files and test apps
|
|
||||||
test-apps/
|
|
||||||
tests/
|
|
||||||
__tests__/
|
|
||||||
*.test.ts
|
|
||||||
*.spec.ts
|
|
||||||
*.test.js
|
|
||||||
*.spec.js
|
|
||||||
*.test.swift
|
|
||||||
*.spec.swift
|
|
||||||
|
|
||||||
# Documentation (keep only essential)
|
|
||||||
docs/
|
|
||||||
doc/
|
|
||||||
*.md
|
|
||||||
!README.md
|
|
||||||
!LICENSE
|
|
||||||
!CHANGELOG.md
|
|
||||||
|
|
||||||
# Development files
|
|
||||||
.vscode/
|
|
||||||
.idea/
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# CI/CD
|
|
||||||
.github/
|
|
||||||
.gitlab-ci.yml
|
|
||||||
.travis.yml
|
|
||||||
|
|
||||||
# Logs
|
|
||||||
*.log
|
|
||||||
logs/
|
|
||||||
|
|
||||||
# Environment
|
|
||||||
.env
|
|
||||||
.env.local
|
|
||||||
.env.*.local
|
|
||||||
|
|
||||||
# Temporary files
|
|
||||||
*.tmp
|
|
||||||
*.temp
|
|
||||||
.cache/
|
|
||||||
*.lock
|
|
||||||
*.bin
|
|
||||||
workflow/
|
|
||||||
screenshots/
|
|
||||||
*.zip
|
|
||||||
*.gz
|
|
||||||
|
|
||||||
# Scripts (not needed in published package)
|
|
||||||
scripts/
|
|
||||||
|
|
||||||
# Gradle build cache
|
|
||||||
.gradle/
|
|
||||||
android/.gradle/
|
|
||||||
android/app/build/
|
|
||||||
android/build/
|
|
||||||
|
|
||||||
# iOS test app (not part of plugin deliverable)
|
|
||||||
ios/App/**
|
|
||||||
|
|
||||||
# iOS build artifacts
|
|
||||||
ios/Pods/
|
|
||||||
ios/build/
|
|
||||||
ios/Podfile.lock
|
|
||||||
ios/DerivedData/
|
|
||||||
ios/*.xcworkspace/
|
|
||||||
ios/*.xcodeproj/*
|
|
||||||
!ios/*.xcodeproj/project.pbxproj
|
|
||||||
!ios/*.xcodeproj/xcshareddata/
|
|
||||||
!ios/*.xcworkspace/contents.xcworkspacedata
|
|
||||||
|
|
||||||
# Xcode user state (nested anywhere)
|
|
||||||
**/xcuserdata/**
|
|
||||||
**/*.xcuserstate
|
|
||||||
|
|
||||||
# Xcode build artifacts (nested anywhere)
|
|
||||||
**/DerivedData/**
|
|
||||||
**/.swiftpm/**
|
|
||||||
|
|
||||||
# Package artifacts
|
|
||||||
*.tgz
|
|
||||||
|
|
||||||
# Coverage
|
|
||||||
coverage/
|
|
||||||
.nyc_output/
|
|
||||||
|
|
||||||
48
Makefile
48
Makefile
@@ -1,48 +0,0 @@
|
|||||||
# Makefile for Daily Notification Plugin
|
|
||||||
#
|
|
||||||
# Primary targets:
|
|
||||||
# make ci - Run local CI (./ci/run.sh)
|
|
||||||
# make verify - Run verification script directly
|
|
||||||
# make build - Build the project
|
|
||||||
# make test - Run tests
|
|
||||||
# make clean - Clean build artifacts
|
|
||||||
#
|
|
||||||
# CI is the single source of truth - always gate releases with: make ci
|
|
||||||
|
|
||||||
.PHONY: ci verify build test clean help
|
|
||||||
|
|
||||||
# Default target
|
|
||||||
help:
|
|
||||||
@echo "Daily Notification Plugin - Makefile"
|
|
||||||
@echo ""
|
|
||||||
@echo "Targets:"
|
|
||||||
@echo " make ci - Run local CI (./ci/run.sh) - REQUIRED before publish"
|
|
||||||
@echo " make verify - Run verification script directly (./scripts/verify.sh)"
|
|
||||||
@echo " make build - Build the project (npm run build)"
|
|
||||||
@echo " make test - Run tests (npm test)"
|
|
||||||
@echo " make clean - Clean build artifacts (npm run clean)"
|
|
||||||
@echo ""
|
|
||||||
@echo "CI Policy: ./ci/run.sh is the single source of truth for verification"
|
|
||||||
@echo "Always run 'make ci' before publishing or merging PRs"
|
|
||||||
|
|
||||||
# Local CI - single source of truth
|
|
||||||
ci:
|
|
||||||
@echo "Running local CI..."
|
|
||||||
./ci/run.sh
|
|
||||||
|
|
||||||
# Direct verification (bypasses CI wrapper)
|
|
||||||
verify:
|
|
||||||
./scripts/verify.sh
|
|
||||||
|
|
||||||
# Build
|
|
||||||
build:
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
# Test
|
|
||||||
test:
|
|
||||||
npm test
|
|
||||||
|
|
||||||
# Clean
|
|
||||||
clean:
|
|
||||||
npm run clean
|
|
||||||
|
|
||||||
31
README.md
31
README.md
@@ -9,6 +9,28 @@
|
|||||||
|
|
||||||
The Daily Notification Plugin is a comprehensive Capacitor plugin that provides enterprise-grade daily notification functionality across Android, iOS, and Electron platforms. It features dual scheduling, callback support, TTL-at-fire logic, and comprehensive observability.
|
The Daily Notification Plugin is a comprehensive Capacitor plugin that provides enterprise-grade daily notification functionality across Android, iOS, and Electron platforms. It features dual scheduling, callback support, TTL-at-fire logic, and comprehensive observability.
|
||||||
|
|
||||||
|
### **Main Artifacts & Concepts**
|
||||||
|
|
||||||
|
This is meant to be included within another project.
|
||||||
|
|
||||||
|
In addition, it does contain some standalone tests in the `test-apps` directory:
|
||||||
|
- android
|
||||||
|
- in `android-test-app` is an app with buttons to trigger actions
|
||||||
|
- Building capacitor app builds the plugin: `npm install` with a new plugin to get it into `node_modules`, and then building the capacitor app builds from those `node_modules` artifacts.
|
||||||
|
- ios: similar functionality in `ios-test-app`
|
||||||
|
- `daily-notification-test` includes Vue
|
||||||
|
|
||||||
|
Other points:
|
||||||
|
- Alarms persist when backgrounded & when closed
|
||||||
|
- Alarms do not persist when force-stopped - a restart is needed to start the timer
|
||||||
|
- High-level AI docs are in [AI_INTEGRATION_GUIDE.md](./AI_INTEGRATION_GUIDE.md)
|
||||||
|
|
||||||
|
### **Quick Start**
|
||||||
|
|
||||||
|
For the standalone test apps, see [test-apps](./test-apps/BUILD_PROCESS.md).
|
||||||
|
|
||||||
|
For inclusion in another project, see "Installation" below.
|
||||||
|
|
||||||
### 🎯 **Native-First Architecture**
|
### 🎯 **Native-First Architecture**
|
||||||
|
|
||||||
The plugin has been optimized for **native-first deployment** with the following key improvements:
|
The plugin has been optimized for **native-first deployment** with the following key improvements:
|
||||||
@@ -27,6 +49,15 @@ The plugin has been optimized for **native-first deployment** with the following
|
|||||||
|
|
||||||
## Implementation Status
|
## Implementation Status
|
||||||
|
|
||||||
|
### **Overview**
|
||||||
|
|
||||||
|
Dec 17
|
||||||
|
- test-apps
|
||||||
|
- android has been seen to work
|
||||||
|
- ios is being developed (Jose)
|
||||||
|
- after ios, will work on daily-notification-test (that includes Vue)
|
||||||
|
- need to test with real data in the API
|
||||||
|
|
||||||
### ✅ **Phase 2 Complete - Production Ready**
|
### ✅ **Phase 2 Complete - Production Ready**
|
||||||
|
|
||||||
| Component | Status | Implementation |
|
| Component | Status | Implementation |
|
||||||
|
|||||||
125
ci/README.md
125
ci/README.md
@@ -1,125 +0,0 @@
|
|||||||
# Local CI
|
|
||||||
|
|
||||||
This repo uses **local CI** via `./ci/run.sh` (which wraps `./scripts/verify.sh`).
|
|
||||||
|
|
||||||
> **Contract / Policy-as-code:** `./ci/run.sh` is the *only* supported CI entrypoint for this repo. Any release gate, merge gate, or automation must invoke `./ci/run.sh` (not `npm run build` directly). `./scripts/verify.sh` encodes enforced invariants (packaging + core purity + exports).
|
|
||||||
> See also: `docs/progress/00-STATUS.md` for invariants and baseline tags.
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./ci/run.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
## What It Checks
|
|
||||||
|
|
||||||
The CI runs `./scripts/verify.sh`, which performs:
|
|
||||||
|
|
||||||
1. **Environment Diagnostics** - Node.js, npm, Java, Swift, xcodebuild availability
|
|
||||||
2. **Dependencies** - npm install if needed
|
|
||||||
3. **Native Code Location** - Ensures no native code in `src/` directories
|
|
||||||
4. **TypeScript** - Lint, typecheck, unit tests
|
|
||||||
5. **Build** - `npm run build` must succeed
|
|
||||||
6. **Package** - `npm pack --dry-run` with forbidden files check
|
|
||||||
7. **Android** - Build check (if gradlew available)
|
|
||||||
8. **iOS** - Build and test check (if xcodebuild available)
|
|
||||||
|
|
||||||
## Platform-Specific Behavior
|
|
||||||
|
|
||||||
### Linux (CI/Development)
|
|
||||||
|
|
||||||
- ✅ TypeScript checks
|
|
||||||
- ✅ Build checks
|
|
||||||
- ✅ Package checks (forbidden files)
|
|
||||||
- ⚠️ Android builds: Skipped (requires gradlew)
|
|
||||||
- ⚠️ iOS builds: Skipped (requires xcodebuild)
|
|
||||||
|
|
||||||
### macOS (Full CI)
|
|
||||||
|
|
||||||
- ✅ All Linux checks
|
|
||||||
- ✅ iOS builds: Run if xcodebuild available
|
|
||||||
- ✅ iOS tests: Run if xcodebuild available
|
|
||||||
|
|
||||||
## Required Tooling
|
|
||||||
|
|
||||||
### Linux
|
|
||||||
|
|
||||||
- Node.js 18+
|
|
||||||
- npm
|
|
||||||
- Java 17+ (for Android builds, optional)
|
|
||||||
- TypeScript compiler
|
|
||||||
|
|
||||||
### macOS
|
|
||||||
|
|
||||||
- All Linux requirements
|
|
||||||
- Xcode (for iOS builds/tests)
|
|
||||||
- xcodebuild command-line tools
|
|
||||||
|
|
||||||
## Integration Points
|
|
||||||
|
|
||||||
### Release Gate
|
|
||||||
|
|
||||||
Add to your release process:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./ci/run.sh && npm publish
|
|
||||||
```
|
|
||||||
|
|
||||||
### Pre-Merge Gate
|
|
||||||
|
|
||||||
Run before merging PRs:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./ci/run.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
### Git Hook (Recommended)
|
|
||||||
|
|
||||||
Install the pre-push hook to automatically run CI before pushing:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# One-time setup
|
|
||||||
git config core.hooksPath githooks
|
|
||||||
```
|
|
||||||
|
|
||||||
After setup, `githooks/pre-push` will automatically run `./ci/run.sh` before allowing pushes.
|
|
||||||
|
|
||||||
**To skip the hook (not recommended):**
|
|
||||||
```bash
|
|
||||||
git push --no-verify
|
|
||||||
```
|
|
||||||
|
|
||||||
### Makefile Target
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Run local CI
|
|
||||||
make ci
|
|
||||||
```
|
|
||||||
|
|
||||||
This is equivalent to `./ci/run.sh` and provides a convenient alias.
|
|
||||||
|
|
||||||
## Exit Codes
|
|
||||||
|
|
||||||
- `0` - All checks passed
|
|
||||||
- `1` - Verification failed
|
|
||||||
|
|
||||||
## Forbidden Files Check
|
|
||||||
|
|
||||||
The CI hard-fails if `npm pack --dry-run` contains:
|
|
||||||
|
|
||||||
- `xcuserdata/`
|
|
||||||
- `*.xcuserstate`
|
|
||||||
- `DerivedData/`
|
|
||||||
- `ios/App/`
|
|
||||||
- `.DS_Store`
|
|
||||||
- `*.swp`, `*.swo`
|
|
||||||
- `*.orig`, `*.rej`
|
|
||||||
|
|
||||||
This ensures the package is publish-safe.
|
|
||||||
|
|
||||||
## See Also
|
|
||||||
|
|
||||||
- `./scripts/verify.sh` - The actual verification script
|
|
||||||
- `docs/progress/00-STATUS.md` - Current status and packaging invariants
|
|
||||||
- `docs/_reference/github-actions-ci.yml` - Reference GitHub Actions template (not used)
|
|
||||||
|
|
||||||
44
ci/run.sh
44
ci/run.sh
@@ -1,44 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Local CI Entrypoint
|
|
||||||
#
|
|
||||||
# This script wraps ./scripts/verify.sh and provides a stable interface
|
|
||||||
# for CI runners, release gates, and pre-merge checks.
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
# ./ci/run.sh
|
|
||||||
#
|
|
||||||
# Exit codes:
|
|
||||||
# 0 - All checks passed
|
|
||||||
# 1 - Verification failed
|
|
||||||
#
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# Get script directory
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Print header
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "Local CI - Daily Notification Plugin"
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Run verification script
|
|
||||||
if ./scripts/verify.sh; then
|
|
||||||
echo ""
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "✅ Local CI: All checks passed"
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "❌ Local CI: Verification failed"
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -1,53 +1,12 @@
|
|||||||
# Documentation Index (Authoritative)
|
# Documentation Index
|
||||||
|
|
||||||
**Purpose:** Single navigation hub for active documentation; separates contracts, progress truth, guides, and archived/reference-only material.
|
**Last Updated:** 2025-12-16
|
||||||
**Owner:** Development Team
|
**Purpose:** Central navigation hub for all project documentation
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
**Baseline Tag:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
This index provides organized access to all documentation in the repository. For a complete audit trail of file movements, see [CONSOLIDATION_SOURCE_MAP.md](./CONSOLIDATION_SOURCE_MAP.md).
|
This index provides organized access to all documentation in the repository. For a complete audit trail of file movements, see [CONSOLIDATION_SOURCE_MAP.md](./CONSOLIDATION_SOURCE_MAP.md).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Policy & Contracts (Executable)
|
|
||||||
|
|
||||||
These are **policy-as-code**. Any gate (push, release, publish) MUST call `./ci/run.sh`.
|
|
||||||
|
|
||||||
- **System Invariants:** `docs/SYSTEM_INVARIANTS.md` — Single authoritative document naming and explaining all enforced invariants
|
|
||||||
- **Local CI Contract:** `./ci/run.sh` — Single source of truth for CI/release gates
|
|
||||||
- **Verification / Invariants:** `./scripts/verify.sh` — Encodes packaging, core-purity, and build invariants
|
|
||||||
- **CI Usage & Setup:** `ci/README.md` — Local CI documentation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Progress Tracking (Authoritative)
|
|
||||||
|
|
||||||
These files define the current truth about project state, decisions, and verification history.
|
|
||||||
|
|
||||||
- **[00-STATUS.md](./progress/00-STATUS.md)** — Current status, invariants, next actions
|
|
||||||
- **[01-CHANGELOG-WORK.md](./progress/01-CHANGELOG-WORK.md)** — Development changelog
|
|
||||||
- **[02-OPEN-QUESTIONS.md](./progress/02-OPEN-QUESTIONS.md)** — Open questions + closed decisions log
|
|
||||||
- **[03-TEST-RUNS.md](./progress/03-TEST-RUNS.md)** — Canonical record of what ran and when
|
|
||||||
- **[04-PARITY-MATRIX.md](./progress/04-PARITY-MATRIX.md)** — iOS/Android parity tracking
|
|
||||||
- **[05-CHATGPT-FEEDBACK-PACKAGE.md](./progress/05-CHATGPT-FEEDBACK-PACKAGE.md)** — AI collaboration package
|
|
||||||
- **[P2-DESIGN.md](./progress/P2-DESIGN.md)** — P2 scope, invariants, and acceptance criteria (design-only)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Archive & Reference-only
|
|
||||||
|
|
||||||
- **`docs/_archive/`** — Historical artifacts, preserved for audit trail (not part of active doc surface)
|
|
||||||
- `docs/_archive/2025-legacy-doc/` — Legacy documentation from 2025
|
|
||||||
- [IMPLEMENTATION_CHECKLIST_LEGACY.md](./_archive/2025-legacy-doc/IMPLEMENTATION_CHECKLIST_LEGACY.md) — iOS Phase 1 checklist (historical)
|
|
||||||
- `docs/_archive/2025-12-16-consolidation/` — 2025-12-16 consolidation artifacts (audit trail)
|
|
||||||
- [CONSOLIDATION_COMPLETE.md](./_archive/2025-12-16-consolidation/CONSOLIDATION_COMPLETE.md) — Consolidation completion summary
|
|
||||||
- [CONSOLIDATION_SOURCE_MAP.md](./_archive/2025-12-16-consolidation/CONSOLIDATION_SOURCE_MAP.md) — Complete file mapping (139 files)
|
|
||||||
- **`docs/_reference/`** — Reference templates (not used by current workflow)
|
|
||||||
- `docs/_reference/github-actions-ci.yml` — GitHub Actions CI template (reference only)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Quick Start
|
## Quick Start
|
||||||
|
|
||||||
**New to the project?** Start here:
|
**New to the project?** Start here:
|
||||||
@@ -92,7 +51,7 @@ These files define the current truth about project state, decisions, and verific
|
|||||||
|
|
||||||
**Location:** `docs/platform/ios/`
|
**Location:** `docs/platform/ios/`
|
||||||
|
|
||||||
- **[IOS_IMPLEMENTATION_CHECKLIST.md](./platform/ios/IOS_IMPLEMENTATION_CHECKLIST.md)** - iOS implementation checklist
|
- **[IMPLEMENTATION_CHECKLIST.md](./platform/ios/IMPLEMENTATION_CHECKLIST.md)** - iOS implementation checklist
|
||||||
- **[IMPLEMENTATION_DIRECTIVE.md](./platform/ios/IMPLEMENTATION_DIRECTIVE.md)** - iOS implementation directive
|
- **[IMPLEMENTATION_DIRECTIVE.md](./platform/ios/IMPLEMENTATION_DIRECTIVE.md)** - iOS implementation directive
|
||||||
- **[DOCUMENTATION_REVIEW.md](./platform/ios/DOCUMENTATION_REVIEW.md)** - Documentation review
|
- **[DOCUMENTATION_REVIEW.md](./platform/ios/DOCUMENTATION_REVIEW.md)** - Documentation review
|
||||||
- **[CORE_DATA_MIGRATION.md](./platform/ios/CORE_DATA_MIGRATION.md)** - Core Data migration guide
|
- **[CORE_DATA_MIGRATION.md](./platform/ios/CORE_DATA_MIGRATION.md)** - Core Data migration guide
|
||||||
@@ -237,7 +196,7 @@ The alarm system documentation is well-organized and kept in its current locatio
|
|||||||
|
|
||||||
### Deployment
|
### Deployment
|
||||||
|
|
||||||
- **[deployment-guide.md](./deployment-guide.md)** - Deployment guide (primary)
|
- **[DEPLOYMENT_GUIDE.md](./DEPLOYMENT_GUIDE.md)** - Deployment guide
|
||||||
- **[DEPLOYMENT_CHECKLIST.md](./DEPLOYMENT_CHECKLIST.md)** - Deployment checklist
|
- **[DEPLOYMENT_CHECKLIST.md](./DEPLOYMENT_CHECKLIST.md)** - Deployment checklist
|
||||||
- **[DEPLOYMENT_SUMMARY.md](./DEPLOYMENT_SUMMARY.md)** - Deployment summary
|
- **[DEPLOYMENT_SUMMARY.md](./DEPLOYMENT_SUMMARY.md)** - Deployment summary
|
||||||
|
|
||||||
@@ -276,8 +235,6 @@ Historical documentation preserved verbatim. See [CONSOLIDATION_SOURCE_MAP.md](.
|
|||||||
- Historical build and integration notes
|
- Historical build and integration notes
|
||||||
- Test app setup guides (superseded by current testing docs)
|
- Test app setup guides (superseded by current testing docs)
|
||||||
|
|
||||||
> **Note:** Archive documentation is discoverable but not listed in the main navigation. See "Archive & Reference-only" section above for archive locations.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Document Map by Category
|
## Document Map by Category
|
||||||
@@ -320,7 +277,7 @@ Historical documentation preserved verbatim. See [CONSOLIDATION_SOURCE_MAP.md](.
|
|||||||
- **Test on Android** → See [Android Test App Docs](../test-apps/android-test-app/docs/)
|
- **Test on Android** → See [Android Test App Docs](../test-apps/android-test-app/docs/)
|
||||||
- **Understand alarms** → Browse [Alarms Documentation](./alarms/)
|
- **Understand alarms** → Browse [Alarms Documentation](./alarms/)
|
||||||
- **Troubleshoot** → Check platform-specific troubleshooting guides
|
- **Troubleshoot** → Check platform-specific troubleshooting guides
|
||||||
- **Deploy** → See [Deployment Guide](./deployment-guide.md)
|
- **Deploy** → See [Deployment Guide](./DEPLOYMENT_GUIDE.md)
|
||||||
|
|
||||||
### By Platform
|
### By Platform
|
||||||
|
|
||||||
@@ -340,8 +297,6 @@ Historical documentation preserved verbatim. See [CONSOLIDATION_SOURCE_MAP.md](.
|
|||||||
|
|
||||||
### Updating This Index
|
### Updating This Index
|
||||||
|
|
||||||
**Index-first rule:** New docs must be linked from `docs/00-INDEX.md` or explicitly placed under `_archive/` / `_reference/`.
|
|
||||||
|
|
||||||
When adding new documentation:
|
When adding new documentation:
|
||||||
|
|
||||||
1. Place file in appropriate category directory
|
1. Place file in appropriate category directory
|
||||||
@@ -356,6 +311,6 @@ For complete consolidation audit trail, see:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
**Last Updated:** 2025-12-16
|
||||||
**Maintained By:** Development Team
|
**Maintained By:** Documentation Team
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
# TimeSafari Daily Notification Plugin - Deployment Checklist
|
# TimeSafari Daily Notification Plugin - Deployment Checklist
|
||||||
|
|
||||||
> **See also:** [deployment-guide.md](./deployment-guide.md) for complete guide
|
|
||||||
|
|
||||||
**SSH Git Path**: `ssh://git@173.199.124.46:222/trent_larson/daily-notification-plugin.git`
|
**SSH Git Path**: `ssh://git@173.199.124.46:222/trent_larson/daily-notification-plugin.git`
|
||||||
**Version**: `2.2.0`
|
**Version**: `2.2.0`
|
||||||
**Deployment Date**: 2025-10-08 06:24:57 UTC
|
**Deployment Date**: 2025-10-08 06:24:57 UTC
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
# TimeSafari Daily Notification Plugin - Deployment Summary
|
# TimeSafari Daily Notification Plugin - Deployment Summary
|
||||||
|
|
||||||
> **See also:** [deployment-guide.md](./deployment-guide.md) for complete guide
|
|
||||||
|
|
||||||
**SSH Git Path**: `ssh://git@173.199.124.46:222/trent_larson/daily-notification-plugin.git`
|
**SSH Git Path**: `ssh://git@173.199.124.46:222/trent_larson/daily-notification-plugin.git`
|
||||||
**Version**: `2.2.0`
|
**Version**: `2.2.0`
|
||||||
**Status**: ✅ **PRODUCTION READY**
|
**Status**: ✅ **PRODUCTION READY**
|
||||||
|
|||||||
@@ -1,292 +0,0 @@
|
|||||||
# P1.5 Documentation Consolidation Plan
|
|
||||||
|
|
||||||
**Date:** 2025-12-22
|
|
||||||
**Status:** 🎯 Ready for Implementation
|
|
||||||
**Baseline:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Objective
|
|
||||||
|
|
||||||
Create a **single authoritative documentation index** that clearly separates:
|
|
||||||
- **Policy (contracts)** vs **Narrative (guides)**
|
|
||||||
- **Active** vs **Historical/Archived**
|
|
||||||
- **Canonical** vs **Reference-only**
|
|
||||||
|
|
||||||
**Goal:** Reduce cognitive load without losing audit history.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Principles
|
|
||||||
|
|
||||||
1. **No deletion** — Archive or redirect, never lose context
|
|
||||||
2. **Elevate contracts** — `./ci/run.sh` and `./scripts/verify.sh` are policy-as-code
|
|
||||||
3. **Progress docs are authoritative** — `docs/progress/` is the single source of truth for "where we are"
|
|
||||||
4. **Drift guards** — Every doc has: Purpose, Owner, Last Updated, Status
|
|
||||||
5. **Index lists only active docs** — Archive is discoverable but not cluttering navigation
|
|
||||||
6. **Index-first rule** — New docs must be linked from `docs/00-INDEX.md` or explicitly placed under `_archive/` / `_reference/`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## File-by-File Consolidation Plan
|
|
||||||
|
|
||||||
### 1. Authoritative Index (`docs/00-INDEX.md`)
|
|
||||||
|
|
||||||
**Action:** Update to reflect P0 + P1.4 baseline and elevate contracts
|
|
||||||
|
|
||||||
**Changes:**
|
|
||||||
- Add **"Policy & Contracts"** section at the top (before Quick Start)
|
|
||||||
- `./ci/run.sh` — Local CI entrypoint (single source of truth)
|
|
||||||
- `./scripts/verify.sh` — Verification script (encodes invariants)
|
|
||||||
- `ci/README.md` — CI documentation
|
|
||||||
- Add **"Progress Tracking (Authoritative)"** section
|
|
||||||
- `docs/progress/00-STATUS.md` — Current phase, blockers, next actions
|
|
||||||
- `docs/progress/01-CHANGELOG-WORK.md` — Development changelog
|
|
||||||
- `docs/progress/02-OPEN-QUESTIONS.md` — Open questions and decisions
|
|
||||||
- `docs/progress/03-TEST-RUNS.md` — Test run log (canonical "what ran")
|
|
||||||
- `docs/progress/04-PARITY-MATRIX.md` — iOS/Android parity tracking
|
|
||||||
- `docs/progress/05-CHATGPT-FEEDBACK-PACKAGE.md` — AI collaboration package
|
|
||||||
- Update "Last Updated" to 2025-12-22
|
|
||||||
- Add "Baseline Tag" reference: `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
**Status:** Active (update, don't archive)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2. Progress Docs (`docs/progress/`)
|
|
||||||
|
|
||||||
**Action:** Add drift guard headers to all progress docs
|
|
||||||
|
|
||||||
**Files to update:**
|
|
||||||
- `00-STATUS.md` — Already has Last Updated, add Purpose/Owner/Status
|
|
||||||
- `01-CHANGELOG-WORK.md` — Add standard header
|
|
||||||
- `02-OPEN-QUESTIONS.md` — Add standard header
|
|
||||||
- `03-TEST-RUNS.md` — Add standard header
|
|
||||||
- `04-PARITY-MATRIX.md` — Add standard header
|
|
||||||
- `05-CHATGPT-FEEDBACK-PACKAGE.md` — Already has Last Updated, add Purpose/Owner/Status
|
|
||||||
|
|
||||||
**Header template:**
|
|
||||||
```markdown
|
|
||||||
**Purpose:** [One sentence describing what this doc is for]
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active|archived
|
|
||||||
```
|
|
||||||
|
|
||||||
**Status:** Active (enhance, don't archive)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 3. Consolidation Artifacts (`docs/CONSOLIDATION_*.md`)
|
|
||||||
|
|
||||||
**Action:** Archive with pointer
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- `docs/CONSOLIDATION_COMPLETE.md` — Move to `docs/_archive/2025-12-16-consolidation/`
|
|
||||||
- `docs/CONSOLIDATION_SOURCE_MAP.md` — Move to `docs/_archive/2025-12-16-consolidation/`
|
|
||||||
|
|
||||||
**Replacement:** Add note in `docs/00-INDEX.md` under "Archive Documentation":
|
|
||||||
> Historical consolidation artifacts from 2025-12-16 are preserved in `docs/_archive/2025-12-16-consolidation/`. See `CONSOLIDATION_SOURCE_MAP.md` for complete file mapping.
|
|
||||||
|
|
||||||
**Status:** Archive (preserve, don't delete)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4. Duplicate/Overlapping Docs
|
|
||||||
|
|
||||||
#### 4.1 Testing Quick References
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- `docs/testing/QUICK_REFERENCE.md` — Keep as canonical
|
|
||||||
- `docs/testing/QUICK_REFERENCE_V2.md` — Archive or merge
|
|
||||||
|
|
||||||
**Action:**
|
|
||||||
- If `QUICK_REFERENCE_V2.md` has unique content → Merge into `QUICK_REFERENCE.md`, then archive V2
|
|
||||||
- If `QUICK_REFERENCE_V2.md` is superseded → Archive with pointer in `QUICK_REFERENCE.md`
|
|
||||||
|
|
||||||
**Status:** Review and consolidate
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
#### 4.2 Integration Refactor Notes
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- `docs/integration/REFACTOR_NOTES.md` — Keep as canonical
|
|
||||||
- `docs/integration/REFACTOR_NOTES_QUICK_START.md` — Check if duplicate
|
|
||||||
- `docs/integration/REFACTOR_ANALYSIS.md` — Check if duplicate
|
|
||||||
|
|
||||||
**Action:**
|
|
||||||
- Review for overlap
|
|
||||||
- If duplicates → Archive with pointer
|
|
||||||
- If unique → Keep all, add cross-references
|
|
||||||
|
|
||||||
**Status:** Review and consolidate
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
#### 4.3 iOS Implementation Checklists
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- `docs/platform/ios/IMPLEMENTATION_CHECKLIST.md` — Keep as canonical
|
|
||||||
- `docs/platform/ios/IOS_IMPLEMENTATION_CHECKLIST.md` — Check if duplicate
|
|
||||||
- `docs/platform/ios/IMPLEMENTATION_CHECKLIST_LEGACY.md` — Archive (already marked legacy)
|
|
||||||
|
|
||||||
**Action:**
|
|
||||||
- If `IOS_IMPLEMENTATION_CHECKLIST.md` duplicates `IMPLEMENTATION_CHECKLIST.md` → Archive with pointer
|
|
||||||
- `IMPLEMENTATION_CHECKLIST_LEGACY.md` → Move to `docs/_archive/2025-legacy-doc/`
|
|
||||||
|
|
||||||
**Status:** Review and consolidate
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
#### 4.4 Deployment Docs
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- `docs/deployment-guide.md` — Keep as canonical (if exists)
|
|
||||||
- `docs/DEPLOYMENT_GUIDE.md` — Check if duplicate
|
|
||||||
- `docs/DEPLOYMENT_CHECKLIST.md` — Keep (complementary)
|
|
||||||
- `docs/DEPLOYMENT_SUMMARY.md` — Keep (complementary)
|
|
||||||
|
|
||||||
**Action:**
|
|
||||||
- If `deployment-guide.md` and `DEPLOYMENT_GUIDE.md` are duplicates → Keep one, archive other
|
|
||||||
- Ensure all deployment docs are cross-referenced
|
|
||||||
|
|
||||||
**Status:** Review and consolidate
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 5. AI Artifacts (`docs/ai/`)
|
|
||||||
|
|
||||||
**Action:** Add drift guard headers, clarify purpose
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- All files in `docs/ai/` should have:
|
|
||||||
- **Purpose:** AI collaboration artifacts (not product documentation)
|
|
||||||
- **Status:** active|reference-only
|
|
||||||
|
|
||||||
**Status:** Active (enhance, don't archive)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 6. Platform Docs (`docs/platform/`)
|
|
||||||
|
|
||||||
**Action:** Add drift guard headers, ensure no duplicates
|
|
||||||
|
|
||||||
**Status:** Active (enhance, don't archive)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 7. Testing Docs (`docs/testing/`)
|
|
||||||
|
|
||||||
**Action:** Add drift guard headers, consolidate duplicates
|
|
||||||
|
|
||||||
**Status:** Active (enhance, consolidate duplicates)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 8. Archive Structure
|
|
||||||
|
|
||||||
**Current:** `docs/archive/2025-legacy-doc/`
|
|
||||||
|
|
||||||
**Action:** Create new archive for P1.5:
|
|
||||||
- `docs/_archive/2025-12-16-consolidation/` — Consolidation artifacts
|
|
||||||
- Keep `docs/archive/2025-legacy-doc/` as-is (historical)
|
|
||||||
|
|
||||||
**Status:** Create new archive directory
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Implementation Steps
|
|
||||||
|
|
||||||
### Step 1: Update Index (High Priority)
|
|
||||||
|
|
||||||
1. Update `docs/00-INDEX.md`:
|
|
||||||
- Add "Policy & Contracts" section
|
|
||||||
- Add "Progress Tracking (Authoritative)" section
|
|
||||||
- Update Last Updated to 2025-12-22
|
|
||||||
- Add Baseline Tag reference
|
|
||||||
|
|
||||||
**Exit Criteria:** Index clearly elevates contracts and progress docs
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Step 2: Add Drift Guards (High Priority)
|
|
||||||
|
|
||||||
1. Add standard headers to all `docs/progress/*.md` files
|
|
||||||
2. Add standard headers to key platform/testing docs
|
|
||||||
|
|
||||||
**Exit Criteria:** All progress docs have Purpose/Owner/Last Updated/Status
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Step 3: Archive Consolidation Artifacts (Medium Priority)
|
|
||||||
|
|
||||||
1. Create `docs/_archive/2025-12-16-consolidation/`
|
|
||||||
2. Move `CONSOLIDATION_COMPLETE.md` and `CONSOLIDATION_SOURCE_MAP.md`
|
|
||||||
3. Add pointer in index
|
|
||||||
|
|
||||||
**Exit Criteria:** Consolidation artifacts archived, index updated
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Step 4: Review and Consolidate Duplicates (Medium Priority)
|
|
||||||
|
|
||||||
1. Review testing quick references (merge or archive)
|
|
||||||
2. Review integration refactor notes (merge or archive)
|
|
||||||
3. Review iOS implementation checklists (merge or archive)
|
|
||||||
4. Review deployment docs (merge or archive)
|
|
||||||
|
|
||||||
**Exit Criteria:** No duplicate content, all unique content preserved
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Step 5: Document Contracts Explicitly (Low Priority)
|
|
||||||
|
|
||||||
1. Ensure `ci/README.md` clearly states: "This is policy-as-code"
|
|
||||||
2. Add note in `docs/00-INDEX.md` that `./ci/run.sh` is the CI contract
|
|
||||||
|
|
||||||
**Exit Criteria:** Contracts are clearly documented as policy
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Success Criteria
|
|
||||||
|
|
||||||
- [ ] `docs/00-INDEX.md` elevates contracts and progress docs
|
|
||||||
- [ ] All progress docs have drift guard headers
|
|
||||||
- [ ] Consolidation artifacts archived with pointers
|
|
||||||
- [ ] Duplicate docs consolidated (merged or archived with pointers)
|
|
||||||
- [ ] No information loss (everything preserved or redirected)
|
|
||||||
- [ ] Index lists only active docs (archive discoverable but not cluttering)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Risk Mitigation
|
|
||||||
|
|
||||||
**Risk:** Breaking internal links
|
|
||||||
**Mitigation:** Use redirects/pointers, don't delete files
|
|
||||||
|
|
||||||
**Risk:** Losing context
|
|
||||||
**Mitigation:** Archive with clear headers, preserve original paths in archive
|
|
||||||
|
|
||||||
**Risk:** Index becomes outdated
|
|
||||||
**Mitigation:** Add "Last Updated" to index, make it part of progress doc updates
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Timeline
|
|
||||||
|
|
||||||
**Estimated Effort:** 2-3 hours
|
|
||||||
- Step 1: 30 min
|
|
||||||
- Step 2: 45 min
|
|
||||||
- Step 3: 15 min
|
|
||||||
- Step 4: 60 min (review-heavy)
|
|
||||||
- Step 5: 15 min
|
|
||||||
|
|
||||||
**Dependencies:** None (can proceed immediately)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** Ready for Implementation
|
|
||||||
**Next Action:** Proceed with Step 1 (Update Index)
|
|
||||||
|
|
||||||
@@ -1,197 +0,0 @@
|
|||||||
# P1.5 Step 4: Duplicate Consolidation Clusters
|
|
||||||
|
|
||||||
**Date:** 2025-12-22
|
|
||||||
**Status:** 🎯 Ready for Review & Decision
|
|
||||||
**Baseline:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Objective
|
|
||||||
|
|
||||||
Review and consolidate duplicate/superseded documentation with explicit "keep / merge / archive / redirect" decisions per cluster.
|
|
||||||
|
|
||||||
**Principle:** No information loss — archive or redirect, never delete.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 1: Testing Quick References
|
|
||||||
|
|
||||||
### Files to Review
|
|
||||||
|
|
||||||
- `docs/testing/QUICK_REFERENCE.md` — Current canonical
|
|
||||||
- `docs/testing/QUICK_REFERENCE_V2.md` — Potential duplicate
|
|
||||||
|
|
||||||
### Decision Process
|
|
||||||
|
|
||||||
1. **Compare content:**
|
|
||||||
- If V2 has unique content → Merge into `QUICK_REFERENCE.md`, then archive V2
|
|
||||||
- If V2 is superseded → Archive V2 with pointer in `QUICK_REFERENCE.md`
|
|
||||||
|
|
||||||
2. **Action:**
|
|
||||||
- [ ] Review both files side-by-side
|
|
||||||
- [ ] Decide: merge or archive
|
|
||||||
- [ ] If merge: Update `QUICK_REFERENCE.md` with V2 content, archive V2
|
|
||||||
- [ ] If archive: Move V2 to `docs/_archive/2025-12-16-consolidation/`, add pointer in `QUICK_REFERENCE.md`
|
|
||||||
- [ ] Update `docs/00-INDEX.md` (remove V2 from active list if archived)
|
|
||||||
|
|
||||||
### Authoritative Doc
|
|
||||||
|
|
||||||
- `docs/testing/QUICK_REFERENCE.md` (keep as canonical)
|
|
||||||
|
|
||||||
### Expected Outcome
|
|
||||||
|
|
||||||
- One authoritative quick reference
|
|
||||||
- V2 either merged or archived with pointer
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 2: Integration Refactor Notes
|
|
||||||
|
|
||||||
### Files to Review
|
|
||||||
|
|
||||||
- `docs/integration/REFACTOR_NOTES.md` — Current canonical
|
|
||||||
- `docs/integration/REFACTOR_NOTES_QUICK_START.md` — Check if duplicate
|
|
||||||
- `docs/integration/REFACTOR_ANALYSIS.md` — Check if duplicate
|
|
||||||
|
|
||||||
### Decision Process
|
|
||||||
|
|
||||||
1. **Compare content:**
|
|
||||||
- If `REFACTOR_NOTES_QUICK_START.md` duplicates `REFACTOR_NOTES.md` → Archive with pointer
|
|
||||||
- If `REFACTOR_ANALYSIS.md` duplicates `REFACTOR_NOTES.md` → Archive with pointer
|
|
||||||
- If either has unique content → Keep all, add cross-references
|
|
||||||
|
|
||||||
2. **Action:**
|
|
||||||
- [ ] Review all three files for overlap
|
|
||||||
- [ ] Identify unique vs duplicate content
|
|
||||||
- [ ] If duplicates: Archive with pointer in `REFACTOR_NOTES.md`
|
|
||||||
- [ ] If unique: Keep all, add cross-references between files
|
|
||||||
- [ ] Update `docs/00-INDEX.md` (remove archived files from active list)
|
|
||||||
|
|
||||||
### Authoritative Doc
|
|
||||||
|
|
||||||
- `docs/integration/REFACTOR_NOTES.md` (keep as canonical)
|
|
||||||
|
|
||||||
### Expected Outcome
|
|
||||||
|
|
||||||
- One authoritative refactor notes doc (or multiple with clear cross-references)
|
|
||||||
- Duplicates archived with pointers
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 3: iOS Implementation Checklists
|
|
||||||
|
|
||||||
### Files to Review
|
|
||||||
|
|
||||||
- `docs/platform/ios/IMPLEMENTATION_CHECKLIST.md` — Current canonical
|
|
||||||
- `docs/platform/ios/IOS_IMPLEMENTATION_CHECKLIST.md` — Check if duplicate
|
|
||||||
- `docs/platform/ios/IMPLEMENTATION_CHECKLIST_LEGACY.md` — Already marked legacy
|
|
||||||
|
|
||||||
### Decision Process
|
|
||||||
|
|
||||||
1. **Compare content:**
|
|
||||||
- If `IOS_IMPLEMENTATION_CHECKLIST.md` duplicates `IMPLEMENTATION_CHECKLIST.md` → Archive with pointer
|
|
||||||
- If `IOS_IMPLEMENTATION_CHECKLIST.md` has unique content → Merge into `IMPLEMENTATION_CHECKLIST.md`, then archive
|
|
||||||
- `IMPLEMENTATION_CHECKLIST_LEGACY.md` → Move to `docs/_archive/2025-legacy-doc/` (already marked legacy)
|
|
||||||
|
|
||||||
2. **Action:**
|
|
||||||
- [ ] Review `IOS_IMPLEMENTATION_CHECKLIST.md` vs `IMPLEMENTATION_CHECKLIST.md`
|
|
||||||
- [ ] Decide: merge or archive
|
|
||||||
- [ ] Move `IMPLEMENTATION_CHECKLIST_LEGACY.md` to `docs/_archive/2025-legacy-doc/`
|
|
||||||
- [ ] Update `docs/00-INDEX.md` (remove archived files from active list)
|
|
||||||
|
|
||||||
### Authoritative Doc
|
|
||||||
|
|
||||||
- `docs/platform/ios/IMPLEMENTATION_CHECKLIST.md` (keep as canonical)
|
|
||||||
|
|
||||||
### Expected Outcome
|
|
||||||
|
|
||||||
- One authoritative iOS implementation checklist
|
|
||||||
- Legacy and duplicate files archived with pointers
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 4: Deployment Documentation
|
|
||||||
|
|
||||||
### Files to Review
|
|
||||||
|
|
||||||
- `docs/deployment-guide.md` — Check if exists
|
|
||||||
- `docs/DEPLOYMENT_GUIDE.md` — Check if exists
|
|
||||||
- `docs/DEPLOYMENT_CHECKLIST.md` — Keep (complementary)
|
|
||||||
- `docs/DEPLOYMENT_SUMMARY.md` — Keep (complementary)
|
|
||||||
|
|
||||||
### Decision Process
|
|
||||||
|
|
||||||
1. **Check existence:**
|
|
||||||
- If both `deployment-guide.md` and `DEPLOYMENT_GUIDE.md` exist → Compare content
|
|
||||||
- If one exists → Keep as canonical
|
|
||||||
- If neither exists → Skip this cluster
|
|
||||||
|
|
||||||
2. **If both exist:**
|
|
||||||
- If duplicates → Keep one (prefer `DEPLOYMENT_GUIDE.md` for consistency), archive other
|
|
||||||
- If complementary → Keep both, add cross-references
|
|
||||||
|
|
||||||
3. **Action:**
|
|
||||||
- [ ] Check which deployment guide files exist
|
|
||||||
- [ ] If both exist: Compare content, decide merge or keep both
|
|
||||||
- [ ] If merge: Archive duplicate with pointer
|
|
||||||
- [ ] Ensure all deployment docs are cross-referenced
|
|
||||||
- [ ] Update `docs/00-INDEX.md` (remove archived files from active list)
|
|
||||||
|
|
||||||
### Authoritative Doc
|
|
||||||
|
|
||||||
- `docs/DEPLOYMENT_GUIDE.md` (preferred) or `docs/deployment-guide.md` (if only one exists)
|
|
||||||
- `docs/DEPLOYMENT_CHECKLIST.md` (complementary)
|
|
||||||
- `docs/DEPLOYMENT_SUMMARY.md` (complementary)
|
|
||||||
|
|
||||||
### Expected Outcome
|
|
||||||
|
|
||||||
- One authoritative deployment guide (or multiple with clear cross-references)
|
|
||||||
- Duplicates archived with pointers
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Implementation Checklist
|
|
||||||
|
|
||||||
### Per Cluster
|
|
||||||
|
|
||||||
- [ ] **Cluster 1:** Testing quick references consolidated
|
|
||||||
- [ ] **Cluster 2:** Integration refactor notes consolidated
|
|
||||||
- [ ] **Cluster 3:** iOS implementation checklists consolidated
|
|
||||||
- [ ] **Cluster 4:** Deployment docs consolidated
|
|
||||||
|
|
||||||
### After All Clusters
|
|
||||||
|
|
||||||
- [ ] All archived files moved to appropriate archive directories
|
|
||||||
- [ ] All pointers added to authoritative docs
|
|
||||||
- [ ] `docs/00-INDEX.md` updated (archived files removed from active list)
|
|
||||||
- [ ] `docs/progress/01-CHANGELOG-WORK.md` updated with consolidation summary
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Success Criteria
|
|
||||||
|
|
||||||
- [ ] No duplicate content in active documentation
|
|
||||||
- [ ] All unique content preserved (merged or kept separate with cross-references)
|
|
||||||
- [ ] All archived files have clear pointers from authoritative docs
|
|
||||||
- [ ] Index reflects only active documentation
|
|
||||||
- [ ] No information loss (everything preserved or redirected)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Risk Mitigation
|
|
||||||
|
|
||||||
**Risk:** Losing unique content during merge
|
|
||||||
**Mitigation:** Review side-by-side before any merge, preserve original in archive if uncertain
|
|
||||||
|
|
||||||
**Risk:** Creating new sprawl with cross-references
|
|
||||||
**Mitigation:** Keep cross-references minimal (1-2 lines), prefer single authoritative doc when possible
|
|
||||||
|
|
||||||
**Risk:** Breaking internal links
|
|
||||||
**Mitigation:** Use redirects/pointers, don't delete files
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** Ready for Review & Decision
|
|
||||||
**Next Action:** Review each cluster and make explicit decisions
|
|
||||||
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
# P1.5 Step 4: Consolidation Decisions
|
|
||||||
|
|
||||||
**Date:** 2025-12-22
|
|
||||||
**Status:** ✅ Decisions Made — Ready for Execution
|
|
||||||
**Baseline:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 1: Testing Quick References
|
|
||||||
|
|
||||||
### Analysis
|
|
||||||
|
|
||||||
- **`QUICK_REFERENCE.md`** (222 lines): General testing quick reference with manual/automated testing commands
|
|
||||||
- **`QUICK_REFERENCE_V2.md`** (280 lines): P0 Production-Grade Features focused, includes channel management, exact alarms, JIT freshness, recovery coexistence
|
|
||||||
|
|
||||||
### Decision: **KEEP BOTH** (Different Focus)
|
|
||||||
|
|
||||||
**Rationale:**
|
|
||||||
- V2 is P0-specific and production-focused
|
|
||||||
- Original is general testing reference
|
|
||||||
- They serve different purposes and are complementary
|
|
||||||
|
|
||||||
### Action
|
|
||||||
|
|
||||||
- [x] Keep both files
|
|
||||||
- [ ] Add cross-reference in both files:
|
|
||||||
- In `QUICK_REFERENCE.md`: "For P0 production-grade features testing, see [QUICK_REFERENCE_V2.md](./QUICK_REFERENCE_V2.md)"
|
|
||||||
- In `QUICK_REFERENCE_V2.md`: "For general testing commands, see [QUICK_REFERENCE.md](./QUICK_REFERENCE.md)"
|
|
||||||
- [ ] Update `docs/00-INDEX.md` to list both (already lists both)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 2: Integration Refactor Notes
|
|
||||||
|
|
||||||
### Analysis
|
|
||||||
|
|
||||||
- **`REFACTOR_NOTES.md`** (597 lines): Implementation context, maps codebase to refactor plan
|
|
||||||
- **`REFACTOR_NOTES_QUICK_START.md`** (268 lines): Quick start guide for implementation
|
|
||||||
- **`REFACTOR_ANALYSIS.md`** (853 lines): Architectural refactoring proposal and analysis
|
|
||||||
|
|
||||||
### Decision: **KEEP ALL** (Complementary Documents)
|
|
||||||
|
|
||||||
**Rationale:**
|
|
||||||
- NOTES = Implementation context
|
|
||||||
- QUICK_START = Quick start guide
|
|
||||||
- ANALYSIS = Architectural analysis
|
|
||||||
- They reference each other and serve different purposes
|
|
||||||
|
|
||||||
### Action
|
|
||||||
|
|
||||||
- [x] Keep all three files
|
|
||||||
- [ ] Add cross-references at the top of each:
|
|
||||||
- `REFACTOR_NOTES.md`: "See [REFACTOR_ANALYSIS.md](./REFACTOR_ANALYSIS.md) for architectural analysis and [REFACTOR_NOTES_QUICK_START.md](./REFACTOR_NOTES_QUICK_START.md) for quick start"
|
|
||||||
- `REFACTOR_NOTES_QUICK_START.md`: "See [REFACTOR_ANALYSIS.md](./REFACTOR_ANALYSIS.md) for complete analysis and [REFACTOR_NOTES.md](./REFACTOR_NOTES.md) for implementation context"
|
|
||||||
- `REFACTOR_ANALYSIS.md`: "See [REFACTOR_NOTES.md](./REFACTOR_NOTES.md) for implementation context and [REFACTOR_NOTES_QUICK_START.md](./REFACTOR_NOTES_QUICK_START.md) for quick start"
|
|
||||||
- [ ] Update `docs/00-INDEX.md` to list all three (already lists all)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 3: iOS Implementation Checklists
|
|
||||||
|
|
||||||
### Analysis
|
|
||||||
|
|
||||||
- **`IOS_IMPLEMENTATION_CHECKLIST.md`**: iOS Implementation Checklist (active, 2025-12-08, 478 lines)
|
|
||||||
- **`IMPLEMENTATION_CHECKLIST_LEGACY.md`**: iOS Phase 1 Implementation Checklist (complete, 2025-01-XX, 215 lines)
|
|
||||||
- **`IMPLEMENTATION_CHECKLIST.md`**: Does not exist (was incorrectly referenced in plan)
|
|
||||||
|
|
||||||
### Decision: **ARCHIVE LEGACY**
|
|
||||||
|
|
||||||
**Rationale:**
|
|
||||||
- `IOS_IMPLEMENTATION_CHECKLIST.md` is the current active checklist
|
|
||||||
- `IMPLEMENTATION_CHECKLIST_LEGACY.md` is marked as complete and is historical
|
|
||||||
- Legacy should be archived for audit trail
|
|
||||||
|
|
||||||
### Action
|
|
||||||
|
|
||||||
- [ ] Move `IMPLEMENTATION_CHECKLIST_LEGACY.md` to `docs/_archive/2025-legacy-doc/`
|
|
||||||
- [ ] Add pointer in `IOS_IMPLEMENTATION_CHECKLIST.md`: "For historical Phase 1 checklist, see [IMPLEMENTATION_CHECKLIST_LEGACY.md](../../_archive/2025-legacy-doc/IMPLEMENTATION_CHECKLIST_LEGACY.md)"
|
|
||||||
- [ ] Update `docs/00-INDEX.md` (remove LEGACY from active list, add to archive section)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Cluster 4: Deployment Documentation
|
|
||||||
|
|
||||||
### Analysis
|
|
||||||
|
|
||||||
- **`deployment-guide.md`** (8785 bytes): Main deployment guide
|
|
||||||
- **`DEPLOYMENT_CHECKLIST.md`** (4096 bytes): Deployment checklist (complementary)
|
|
||||||
- **`DEPLOYMENT_SUMMARY.md`** (1685 bytes): Deployment summary (complementary)
|
|
||||||
- **`DEPLOYMENT_GUIDE.md`**: Does not exist (was incorrectly referenced in plan)
|
|
||||||
|
|
||||||
### Decision: **KEEP ALL** (Complementary Documents)
|
|
||||||
|
|
||||||
**Rationale:**
|
|
||||||
- `deployment-guide.md` is the main guide
|
|
||||||
- `DEPLOYMENT_CHECKLIST.md` is a complementary checklist
|
|
||||||
- `DEPLOYMENT_SUMMARY.md` is a complementary summary
|
|
||||||
- They serve different purposes and are complementary
|
|
||||||
|
|
||||||
### Action
|
|
||||||
|
|
||||||
- [x] Keep all three files
|
|
||||||
- [ ] Add cross-references:
|
|
||||||
- In `deployment-guide.md`: "See [DEPLOYMENT_CHECKLIST.md](./DEPLOYMENT_CHECKLIST.md) for checklist and [DEPLOYMENT_SUMMARY.md](./DEPLOYMENT_SUMMARY.md) for summary"
|
|
||||||
- In `DEPLOYMENT_CHECKLIST.md`: "See [deployment-guide.md](./deployment-guide.md) for complete guide"
|
|
||||||
- In `DEPLOYMENT_SUMMARY.md`: "See [deployment-guide.md](./deployment-guide.md) for complete guide"
|
|
||||||
- [ ] Update `docs/00-INDEX.md` to list all three (already lists all)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Summary of Actions
|
|
||||||
|
|
||||||
### Files to Archive
|
|
||||||
|
|
||||||
1. `docs/platform/ios/IMPLEMENTATION_CHECKLIST_LEGACY.md` → `docs/_archive/2025-legacy-doc/`
|
|
||||||
|
|
||||||
### Files to Keep (with cross-references)
|
|
||||||
|
|
||||||
1. `docs/testing/QUICK_REFERENCE.md` + `QUICK_REFERENCE_V2.md` (add cross-refs)
|
|
||||||
2. `docs/integration/REFACTOR_NOTES.md` + `REFACTOR_NOTES_QUICK_START.md` + `REFACTOR_ANALYSIS.md` (add cross-refs)
|
|
||||||
3. `docs/deployment-guide.md` + `DEPLOYMENT_CHECKLIST.md` + `DEPLOYMENT_SUMMARY.md` (add cross-refs)
|
|
||||||
|
|
||||||
### Index Updates
|
|
||||||
|
|
||||||
- Remove `IMPLEMENTATION_CHECKLIST_LEGACY.md` from active iOS docs list
|
|
||||||
- Add `IMPLEMENTATION_CHECKLIST_LEGACY.md` to archive section
|
|
||||||
- Ensure all kept files are listed in index (verify current state)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Execution Checklist
|
|
||||||
|
|
||||||
- [ ] Archive `IMPLEMENTATION_CHECKLIST_LEGACY.md`
|
|
||||||
- [ ] Add cross-references to testing quick references
|
|
||||||
- [ ] Add cross-references to integration refactor notes
|
|
||||||
- [ ] Add cross-references to deployment docs
|
|
||||||
- [ ] Update `docs/00-INDEX.md` (archive section)
|
|
||||||
- [ ] Update `docs/progress/01-CHANGELOG-WORK.md` with consolidation summary
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** Ready for Execution
|
|
||||||
|
|
||||||
@@ -1,425 +0,0 @@
|
|||||||
# System Invariants
|
|
||||||
|
|
||||||
**Purpose:** Single authoritative document naming, explaining, and referencing all enforced invariants.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
**Baseline:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
This document defines the **invariants** (unchanging rules) that this project enforces. These invariants are **policy-as-code** — they are enforced by tooling, not just documented as conventions.
|
|
||||||
|
|
||||||
**Why this matters:**
|
|
||||||
- New contributors can understand "what not to break"
|
|
||||||
- Future work (P2, P3, etc.) has explicit constraints
|
|
||||||
- Violations are caught automatically, not discovered later
|
|
||||||
- The baseline tag (`v1.0.11-p0-p1.4-complete`) represents a state where all invariants are enforced
|
|
||||||
|
|
||||||
**How to use this document:**
|
|
||||||
- Before making changes, review relevant invariants
|
|
||||||
- If you violate an invariant, CI will fail with a clear error
|
|
||||||
- If you need to change an invariant, update this document and the enforcing code together
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. Packaging Invariants (P0)
|
|
||||||
|
|
||||||
### What
|
|
||||||
|
|
||||||
The npm package must not contain forbidden files, and packaging is controlled by a whitelist approach.
|
|
||||||
|
|
||||||
**Specific rules:**
|
|
||||||
- `npm pack --dry-run` must not contain:
|
|
||||||
- `xcuserdata/`, `*.xcuserstate`, `DerivedData/` (Xcode user state)
|
|
||||||
- `ios/App/` (test app, not library code)
|
|
||||||
- `.DS_Store`, `*.swp`, `*.swo`, `*.orig`, `*.rej` (editor/macOS junk)
|
|
||||||
- `package.json.files` whitelist is **authoritative** (primary control)
|
|
||||||
- `.npmignore` is secondary (belt-and-suspenders only)
|
|
||||||
|
|
||||||
### Why
|
|
||||||
|
|
||||||
- **Publish safety:** Prevents shipping developer-local files, test apps, and build artifacts
|
|
||||||
- **Package size:** Keeps published tarball clean and minimal
|
|
||||||
- **Security:** Avoids leaking local development state
|
|
||||||
- **Professionalism:** Published packages should only contain intended library code
|
|
||||||
|
|
||||||
### How
|
|
||||||
|
|
||||||
**Enforced by:** `scripts/verify.sh` → `check_package()` function
|
|
||||||
|
|
||||||
**Enforcement mechanism:**
|
|
||||||
1. Runs `npm pack --dry-run` to simulate package creation
|
|
||||||
2. Extracts file list from pack output (handles multiple npm output formats)
|
|
||||||
3. Scans for forbidden patterns using regex: `xcuserdata/|\.xcuserstate|DerivedData/|\.tgz|ios/App/|\.DS_Store|\.swp|\.swo|\.orig|\.rej`
|
|
||||||
4. **Hard-fails** if any forbidden files are found
|
|
||||||
5. Provides actionable error messages with remediation hints
|
|
||||||
|
|
||||||
**Location:** `scripts/verify.sh:216-316` (function `check_package()`)
|
|
||||||
|
|
||||||
**Verification command:**
|
|
||||||
```bash
|
|
||||||
./ci/run.sh # Includes package checks
|
|
||||||
# Or manually:
|
|
||||||
npm pack --dry-run | grep -E "xcuserdata|xcuserstate|DerivedData|ios/App/"
|
|
||||||
```
|
|
||||||
|
|
||||||
### Where
|
|
||||||
|
|
||||||
- **Enforcing code:** `scripts/verify.sh:216-316` (`check_package()`)
|
|
||||||
- **Policy definition:** `docs/progress/00-STATUS.md:104-113` (Packaging Invariants section)
|
|
||||||
- **Package configuration:** `package.json` (`files` field)
|
|
||||||
- **Secondary exclusion:** `.npmignore` (belt-and-suspenders)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Core Module Purity (P1.4)
|
|
||||||
|
|
||||||
### What
|
|
||||||
|
|
||||||
The `src/core/` module must remain platform-agnostic and portable. It cannot import platform-specific or Node.js built-in modules.
|
|
||||||
|
|
||||||
**Specific rules:**
|
|
||||||
- `src/core/` must not import:
|
|
||||||
- **Node builtins:** `fs`, `path`, `os`, `child_process`, `crypto`, `http`, `https`, `net`, `tls`, `zlib`, `stream`, `util`, `url`, `worker_threads`, `perf_hooks`, `vm`
|
|
||||||
- **Platform modules:** `@capacitor/*`, `react`, `capacitor`
|
|
||||||
- `package.json.exports['./core']` must exist and point to valid build artifacts
|
|
||||||
- Core types must remain platform-agnostic (no platform-specific types in core)
|
|
||||||
|
|
||||||
### Why
|
|
||||||
|
|
||||||
- **Portability:** Core module can be used in any JavaScript/TypeScript environment
|
|
||||||
- **Architectural separation:** Platform-specific code belongs in adapters, not core
|
|
||||||
- **Testability:** Core can be tested without platform dependencies
|
|
||||||
- **Reusability:** Core types/interfaces can be shared across platforms without coupling
|
|
||||||
|
|
||||||
### How
|
|
||||||
|
|
||||||
**Enforced by:** `scripts/verify.sh` → `check_core_source()` + `check_core_artifacts()`
|
|
||||||
|
|
||||||
**Source checks (pre-build):**
|
|
||||||
1. Verifies `src/core/` directory exists
|
|
||||||
2. Checks for required core files (`index.ts`, `errors.ts`, `enums.ts`, `events.ts`, `contracts.ts`, `guards.ts`)
|
|
||||||
3. Scans all files in `src/core/` for forbidden imports using comprehensive regex:
|
|
||||||
```bash
|
|
||||||
(from\s+['\"]|require\s*\(\s*['\"]|import\s*\(\s*['\"])(${NODE_BUILTINS}|react|@capacitor/|capacitor)['\"]
|
|
||||||
```
|
|
||||||
4. **Hard-fails** if forbidden imports are found
|
|
||||||
5. Prints offending lines and policy reminder
|
|
||||||
|
|
||||||
**Artifact checks (post-build):**
|
|
||||||
1. Verifies build artifacts exist: `dist/esm/core/index.js`, `dist/esm/core/index.d.ts`
|
|
||||||
2. Validates `package.json.exports['./core']` exists using Node.js script
|
|
||||||
3. **Hard-fails** if artifacts or exports are missing
|
|
||||||
|
|
||||||
**Location:**
|
|
||||||
- Source checks: `scripts/verify.sh:413-464` (function `check_core_source()`)
|
|
||||||
- Artifact checks: `scripts/verify.sh:467-496` (function `check_core_artifacts()`)
|
|
||||||
|
|
||||||
**Verification command:**
|
|
||||||
```bash
|
|
||||||
./ci/run.sh # Includes core module checks
|
|
||||||
# Or manually check source:
|
|
||||||
grep -RInE "(from\s+['\"]|require\s*\(\s*['\"]|import\s*\(\s*['\"])(${NODE_BUILTINS}|react|@capacitor/|capacitor)['\"]" src/core
|
|
||||||
```
|
|
||||||
|
|
||||||
### Where
|
|
||||||
|
|
||||||
- **Enforcing code:**
|
|
||||||
- Source checks: `scripts/verify.sh:413-464` (`check_core_source()`)
|
|
||||||
- Artifact checks: `scripts/verify.sh:467-496` (`check_core_artifacts()`)
|
|
||||||
- **Policy definition:** `docs/progress/P2-DESIGN.md:67-77` (Core Module Purity section)
|
|
||||||
- **Core module location:** `src/core/`
|
|
||||||
- **Package exports:** `package.json` (`exports['./core']` field)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. CI Authority (P0)
|
|
||||||
|
|
||||||
### What
|
|
||||||
|
|
||||||
`./ci/run.sh` is the **only** supported CI entrypoint. All release gates, merge gates, and automation must invoke `./ci/run.sh`, not `npm run build` directly.
|
|
||||||
|
|
||||||
**Specific rules:**
|
|
||||||
- `./ci/run.sh` is the canonical CI command
|
|
||||||
- All gates (release, merge, automation) must call `./ci/run.sh`
|
|
||||||
- `npm run build` must not be called directly in gates (it doesn't include invariant checks)
|
|
||||||
- `./scripts/verify.sh` is an implementation detail (wrapped by `./ci/run.sh`)
|
|
||||||
|
|
||||||
### Why
|
|
||||||
|
|
||||||
- **Single source of truth:** One command that runs all checks
|
|
||||||
- **Invariant enforcement:** `verify.sh` (called by `ci/run.sh`) encodes packaging, core-purity, and export checks
|
|
||||||
- **Consistency:** All environments (local, CI, release) use the same verification
|
|
||||||
- **Debuggability:** Failures are actionable and consistent across environments
|
|
||||||
- **Policy-as-code:** The contract is explicit, not implicit
|
|
||||||
|
|
||||||
### How
|
|
||||||
|
|
||||||
**Enforced by:** `ci/README.md` (policy-as-code contract) + `githooks/pre-push` (optional automation)
|
|
||||||
|
|
||||||
**Enforcement mechanism:**
|
|
||||||
1. **Documentation contract:** `ci/README.md` explicitly states the policy (line 5-6)
|
|
||||||
2. **Git hook (optional):** `githooks/pre-push` calls `./ci/run.sh` before allowing pushes
|
|
||||||
3. **Makefile target:** `make ci` runs `./ci/run.sh` (convenience alias)
|
|
||||||
4. **Process enforcement:** Team must follow the contract (not automatically enforced, but CI will fail if invariants are violated)
|
|
||||||
|
|
||||||
**Location:**
|
|
||||||
- Policy contract: `ci/README.md:5-6` (Contract / Policy-as-code block)
|
|
||||||
- CI entrypoint: `ci/run.sh` (wraps `./scripts/verify.sh`)
|
|
||||||
- Git hook: `githooks/pre-push` (optional, calls `./ci/run.sh`)
|
|
||||||
|
|
||||||
**Verification command:**
|
|
||||||
```bash
|
|
||||||
./ci/run.sh # The canonical CI command
|
|
||||||
# Or:
|
|
||||||
make ci # Convenience alias
|
|
||||||
```
|
|
||||||
|
|
||||||
### Where
|
|
||||||
|
|
||||||
- **Policy contract:** `ci/README.md:5-6` (Contract / Policy-as-code block)
|
|
||||||
- **CI entrypoint:** `ci/run.sh` (wraps `./scripts/verify.sh`)
|
|
||||||
- **Verification script:** `scripts/verify.sh` (implementation detail)
|
|
||||||
- **Git hook:** `githooks/pre-push` (optional automation)
|
|
||||||
- **Makefile:** `Makefile` (`make ci` target)
|
|
||||||
- **Documentation:** `docs/progress/00-STATUS.md:115-117` (Local CI Policy section)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Export Correctness (P0)
|
|
||||||
|
|
||||||
### What
|
|
||||||
|
|
||||||
All `package.json.exports` paths must match actual build artifacts. Exported paths must exist after build.
|
|
||||||
|
|
||||||
**Specific rules:**
|
|
||||||
- `package.json.exports["./web"]` paths must match actual build artifacts
|
|
||||||
- `package.json.exports["./core"]` paths must match actual build artifacts
|
|
||||||
- All exported paths must exist after `npm run build`
|
|
||||||
- Build must succeed (TypeScript compilation + Rollup bundling)
|
|
||||||
|
|
||||||
### Why
|
|
||||||
|
|
||||||
- **Runtime correctness:** Broken exports cause import failures at runtime
|
|
||||||
- **Type safety:** Missing type definitions break TypeScript consumers
|
|
||||||
- **Publish safety:** Broken exports are discovered before publish, not after
|
|
||||||
- **Consumer trust:** Correct exports are a basic contract with package consumers
|
|
||||||
|
|
||||||
### How
|
|
||||||
|
|
||||||
**Enforced by:** `scripts/verify.sh` → `check_build()` function
|
|
||||||
|
|
||||||
**Enforcement mechanism:**
|
|
||||||
1. Runs `npm run build` to generate build artifacts
|
|
||||||
2. Verifies build succeeds (exit code check)
|
|
||||||
3. Checks for required build outputs:
|
|
||||||
- `dist/esm/web.d.ts`, `dist/esm/web.js`
|
|
||||||
- `dist/esm/core/index.d.ts`, `dist/esm/core/index.js`
|
|
||||||
4. **Hard-fails** if build fails or artifacts are missing
|
|
||||||
5. Core artifact validation also checks `package.json.exports['./core']` exists (via `check_core_artifacts()`)
|
|
||||||
|
|
||||||
**Location:** `scripts/verify.sh:191-214` (function `check_build()`)
|
|
||||||
|
|
||||||
**Verification command:**
|
|
||||||
```bash
|
|
||||||
./ci/run.sh # Includes build checks
|
|
||||||
# Or manually:
|
|
||||||
npm run build && ls -la dist/esm/web.* dist/esm/core/index.*
|
|
||||||
```
|
|
||||||
|
|
||||||
### Where
|
|
||||||
|
|
||||||
- **Enforcing code:** `scripts/verify.sh:191-214` (`check_build()`)
|
|
||||||
- **Export definitions:** `package.json` (`exports` field)
|
|
||||||
- **Build artifacts:** `dist/esm/` (generated by `npm run build`)
|
|
||||||
- **Policy definition:** `docs/progress/00-STATUS.md:111` (Export correctness requirement)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Documentation Structure (P1.5)
|
|
||||||
|
|
||||||
### What
|
|
||||||
|
|
||||||
Documentation must follow the index-first rule and maintain drift guards. New docs must be discoverable via the index or explicitly archived.
|
|
||||||
|
|
||||||
**Specific rules:**
|
|
||||||
- **Index-first rule:** New docs must be linked from `docs/00-INDEX.md` or placed in `_archive/`/`_reference/`
|
|
||||||
- **Progress docs are authoritative:** `docs/progress/` is the single source of truth for project state
|
|
||||||
- **Archive structure:** Historical docs go in `docs/_archive/` (underscore indicates "not active doc surface")
|
|
||||||
- **Drift guards:** Key docs have standard headers (Purpose, Owner, Last Updated, Status)
|
|
||||||
|
|
||||||
### Why
|
|
||||||
|
|
||||||
- **Discoverability:** Contributors can find docs via the index
|
|
||||||
- **Prevents sprawl:** Index-first rule prevents undocumented files
|
|
||||||
- **Maintainability:** Drift guards (Last Updated, Status) help identify stale docs
|
|
||||||
- **Audit trail:** Archive preserves history without cluttering active navigation
|
|
||||||
- **Authority:** Progress docs are clearly marked as "truth" vs "guides"
|
|
||||||
|
|
||||||
### How
|
|
||||||
|
|
||||||
**Enforced by:** `docs/00-INDEX.md` (index-first rule) + documentation process
|
|
||||||
|
|
||||||
**Enforcement mechanism:**
|
|
||||||
1. **Index-first rule:** Stated in `docs/00-INDEX.md:298-305` (Maintenance section)
|
|
||||||
2. **Process enforcement:** Team must add new docs to index (not automatically enforced, but discoverability suffers if not followed)
|
|
||||||
3. **Drift guards:** Standard header format in progress docs:
|
|
||||||
```markdown
|
|
||||||
**Purpose:** [one sentence]
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** YYYY-MM-DD
|
|
||||||
**Status:** active|archived
|
|
||||||
```
|
|
||||||
4. **Archive structure:** `docs/_archive/` clearly separated from active docs
|
|
||||||
|
|
||||||
**Location:**
|
|
||||||
- Index: `docs/00-INDEX.md` (central navigation hub)
|
|
||||||
- Index-first rule: `docs/00-INDEX.md:298-305` (Maintenance section)
|
|
||||||
- Progress docs: `docs/progress/` (authoritative state)
|
|
||||||
- Archive: `docs/_archive/` (historical artifacts)
|
|
||||||
|
|
||||||
**Verification command:**
|
|
||||||
```bash
|
|
||||||
# Manual review:
|
|
||||||
# 1. Check that new docs are in index
|
|
||||||
# 2. Verify progress docs have drift guards
|
|
||||||
# 3. Confirm archive structure is standardized
|
|
||||||
```
|
|
||||||
|
|
||||||
### Where
|
|
||||||
|
|
||||||
- **Index:** `docs/00-INDEX.md` (central navigation hub)
|
|
||||||
- **Index-first rule:** `docs/00-INDEX.md:298-305` (Maintenance section)
|
|
||||||
- **Progress docs:** `docs/progress/` (authoritative state)
|
|
||||||
- **Archive structure:** `docs/_archive/` (historical artifacts)
|
|
||||||
- **Policy definition:** `docs/progress/P2-DESIGN.md:105-113` (Documentation Structure section)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. Baseline Tag Integrity
|
|
||||||
|
|
||||||
### What
|
|
||||||
|
|
||||||
The baseline tag `v1.0.11-p0-p1.4-complete` represents a known-good architectural baseline where all invariants are enforced. P2 work must not invalidate this baseline.
|
|
||||||
|
|
||||||
**Specific rules:**
|
|
||||||
- Baseline tag: `v1.0.11-p0-p1.4-complete`
|
|
||||||
- This tag represents:
|
|
||||||
- All P0 invariants enforced (packaging, CI authority, exports)
|
|
||||||
- All P1.4 invariants enforced (core module purity)
|
|
||||||
- All P1.5 invariants enforced (documentation structure)
|
|
||||||
- All tooling in place (`verify.sh`, `ci/run.sh`)
|
|
||||||
- P2 work must not require rollback to this baseline
|
|
||||||
- P2 work must not break any invariant enforced at baseline
|
|
||||||
|
|
||||||
### Why
|
|
||||||
|
|
||||||
- **Safety anchor:** Provides a known-good state to rollback to if needed
|
|
||||||
- **Reference point:** Future work can compare against baseline
|
|
||||||
- **Confidence:** Baseline represents a tested, stable state
|
|
||||||
- **Historical record:** Tag preserves the state where foundation was complete
|
|
||||||
|
|
||||||
### How
|
|
||||||
|
|
||||||
**Enforced by:** Git tag + process (not automatically enforced, but baseline must remain valid)
|
|
||||||
|
|
||||||
**Enforcement mechanism:**
|
|
||||||
1. **Git tag:** `v1.0.11-p0-p1.4-complete` exists in repository
|
|
||||||
2. **Process enforcement:** Team must not break baseline (CI will catch invariant violations)
|
|
||||||
3. **Validation:** Can verify baseline by checking out tag and running `./ci/run.sh` (should pass)
|
|
||||||
|
|
||||||
**Location:**
|
|
||||||
- Baseline tag: `v1.0.11-p0-p1.4-complete` (Git tag)
|
|
||||||
- Baseline description: `docs/progress/00-STATUS.md:121` (Baseline Tag section)
|
|
||||||
- P2 constraint: `docs/progress/P2-DESIGN.md:117-125` (Baseline Tag Integrity section)
|
|
||||||
|
|
||||||
**Verification command:**
|
|
||||||
```bash
|
|
||||||
# Verify baseline is still valid:
|
|
||||||
git checkout v1.0.11-p0-p1.4-complete
|
|
||||||
./ci/run.sh # Should pass
|
|
||||||
git checkout - # Return to current branch
|
|
||||||
```
|
|
||||||
|
|
||||||
### Where
|
|
||||||
|
|
||||||
- **Baseline tag:** `v1.0.11-p0-p1.4-complete` (Git tag)
|
|
||||||
- **Baseline description:** `docs/progress/00-STATUS.md:121` (Baseline Tag section)
|
|
||||||
- **P2 constraint:** `docs/progress/P2-DESIGN.md:117-125` (Baseline Tag Integrity section)
|
|
||||||
- **Status doc:** `docs/progress/00-STATUS.md:15-23` (What This Baseline Includes section)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
|
|
||||||
### Invariant Enforcement Matrix
|
|
||||||
|
|
||||||
| Invariant | Enforced By | Hard-Fail? | Verification Command |
|
|
||||||
|-----------|-------------|------------|---------------------|
|
|
||||||
| Packaging | `verify.sh` → `check_package()` | ✅ Yes | `./ci/run.sh` |
|
|
||||||
| Core Purity | `verify.sh` → `check_core_source()` + `check_core_artifacts()` | ✅ Yes | `./ci/run.sh` |
|
|
||||||
| CI Authority | `ci/README.md` (contract) | ⚠️ Process | Manual review |
|
|
||||||
| Export Correctness | `verify.sh` → `check_build()` | ✅ Yes | `./ci/run.sh` |
|
|
||||||
| Documentation Structure | `docs/00-INDEX.md` (index-first rule) | ⚠️ Process | Manual review |
|
|
||||||
| Baseline Integrity | Git tag + process | ⚠️ Process | `git checkout v1.0.11-p0-p1.4-complete && ./ci/run.sh` |
|
|
||||||
|
|
||||||
**Legend:**
|
|
||||||
- ✅ **Hard-Fail:** CI automatically fails if violated
|
|
||||||
- ⚠️ **Process:** Enforced by process/documentation, not automatic
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## For New Contributors
|
|
||||||
|
|
||||||
**Before making changes:**
|
|
||||||
1. Review relevant invariants above
|
|
||||||
2. Run `./ci/run.sh` to verify current state passes
|
|
||||||
3. Make your changes
|
|
||||||
4. Run `./ci/run.sh` again — it will catch invariant violations automatically
|
|
||||||
|
|
||||||
**If CI fails:**
|
|
||||||
- Read the error message — it explains which invariant was violated
|
|
||||||
- Check the "Where" section above for the enforcing code
|
|
||||||
- Fix the violation (or discuss changing the invariant if needed)
|
|
||||||
|
|
||||||
**If you need to change an invariant:**
|
|
||||||
1. Update this document (`docs/SYSTEM_INVARIANTS.md`)
|
|
||||||
2. Update the enforcing code (usually `scripts/verify.sh`)
|
|
||||||
3. Update any related documentation
|
|
||||||
4. Ensure the change is backward-compatible or properly versioned
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Related Documentation
|
|
||||||
|
|
||||||
- **P2 Design:** `docs/progress/P2-DESIGN.md` — Defines P2 scope and constraints
|
|
||||||
- **Progress Status:** `docs/progress/00-STATUS.md` — Current status and packaging invariants
|
|
||||||
- **CI Documentation:** `ci/README.md` — Local CI usage and contract
|
|
||||||
- **Verification Script:** `scripts/verify.sh` — Implementation of invariant checks
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Maintained By:** Development Team
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Type Safety Notes
|
|
||||||
|
|
||||||
**Policy:** All external boundaries use `unknown`, all data payloads use `Record<string, unknown>`. No `any` allowed except documented TypeScript limitations.
|
|
||||||
|
|
||||||
**Allowed Exception:**
|
|
||||||
- **`src/utils/PlatformServiceMixin.ts:258`** — `any[]` required for TypeScript mixin constructor pattern
|
|
||||||
- **Reason:** TypeScript's mixin pattern requires `any[]` for constructor arguments (language limitation, not design choice)
|
|
||||||
- **Status:** Documented with inline comment explaining the limitation
|
|
||||||
- **Verification:** `rg '\bany\b' src/` returns zero matches except this documented exception
|
|
||||||
|
|
||||||
**Verification:**
|
|
||||||
- Run `rg -n "\bany\b" src/ --type ts | grep -v "node_modules" | grep -v "test"` — should return only the documented exception
|
|
||||||
- All external boundaries (`src/web.ts`, plugin interfaces) use `unknown` for inputs
|
|
||||||
- All data payloads (`src/observability.ts`, `src/core/events.ts`) use `Record<string, unknown>`
|
|
||||||
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
# REFERENCE ONLY — not used in this repo
|
|
||||||
#
|
|
||||||
# This file is kept as a reference template for GitHub Actions CI.
|
|
||||||
# This repo uses local CI via `./ci/run.sh` (which wraps `./scripts/verify.sh`).
|
|
||||||
#
|
|
||||||
# If you want to use GitHub Actions instead:
|
|
||||||
# 1. Copy this file to `.github/workflows/ci.yml`
|
|
||||||
# 2. Ensure it calls `./ci/run.sh` or `./scripts/verify.sh`
|
|
||||||
# 3. Update progress docs to reflect GitHub Actions usage
|
|
||||||
#
|
|
||||||
# ---
|
|
||||||
|
|
||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ main, develop ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ main, develop ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
verify:
|
|
||||||
name: Verify Project
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '20'
|
|
||||||
cache: 'npm'
|
|
||||||
|
|
||||||
- name: Setup Java (for Android builds)
|
|
||||||
uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: 'temurin'
|
|
||||||
java-version: '17'
|
|
||||||
|
|
||||||
- name: Run verification
|
|
||||||
run: ./scripts/verify.sh
|
|
||||||
|
|
||||||
- name: Upload verification logs
|
|
||||||
if: failure()
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: verification-logs
|
|
||||||
path: |
|
|
||||||
**/*.log
|
|
||||||
**/build/reports/**
|
|
||||||
retention-days: 7
|
|
||||||
@@ -4,8 +4,6 @@
|
|||||||
**Version**: 1.0.0
|
**Version**: 1.0.0
|
||||||
**Created**: 2025-10-08 06:24:57 UTC
|
**Created**: 2025-10-08 06:24:57 UTC
|
||||||
|
|
||||||
> **See also:** [DEPLOYMENT_CHECKLIST.md](./DEPLOYMENT_CHECKLIST.md) for checklist | [DEPLOYMENT_SUMMARY.md](./DEPLOYMENT_SUMMARY.md) for summary
|
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
This guide provides comprehensive instructions for deploying the TimeSafari Daily Notification Plugin from the SSH git repository to production environments.
|
This guide provides comprehensive instructions for deploying the TimeSafari Daily Notification Plugin from the SSH git repository to production environments.
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
**Date**: 2025-10-29
|
**Date**: 2025-10-29
|
||||||
**Status**: 🎯 **ANALYSIS** - Architectural refactoring proposal
|
**Status**: 🎯 **ANALYSIS** - Architectural refactoring proposal
|
||||||
|
|
||||||
> **See also:** [REFACTOR_NOTES.md](./REFACTOR_NOTES.md) for implementation context | [REFACTOR_NOTES_QUICK_START.md](./REFACTOR_NOTES_QUICK_START.md) for quick start
|
|
||||||
|
|
||||||
## Objective
|
## Objective
|
||||||
|
|
||||||
Refactor the Daily Notification Plugin architecture so that **TimeSafari-specific integration logic is implemented by the Capacitor host app** rather than hardcoded in the plugin. This makes the plugin generic and reusable for other applications.
|
Refactor the Daily Notification Plugin architecture so that **TimeSafari-specific integration logic is implemented by the Capacitor host app** rather than hardcoded in the plugin. This makes the plugin generic and reusable for other applications.
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
**Date**: 2025-10-29
|
**Date**: 2025-10-29
|
||||||
**Status**: 🎯 **CONTEXT** - Pre-implementation analysis and mapping
|
**Status**: 🎯 **CONTEXT** - Pre-implementation analysis and mapping
|
||||||
|
|
||||||
> **See also:** [REFACTOR_ANALYSIS.md](./REFACTOR_ANALYSIS.md) for architectural analysis | [REFACTOR_NOTES_QUICK_START.md](./REFACTOR_NOTES_QUICK_START.md) for quick start
|
|
||||||
|
|
||||||
## Purpose
|
## Purpose
|
||||||
|
|
||||||
This document maps the current codebase to the Integration Point Refactor plan, identifies what exists, what needs to be created, and where gaps exist before starting implementation (PR1).
|
This document maps the current codebase to the Integration Point Refactor plan, identifies what exists, what needs to be created, and where gaps exist before starting implementation (PR1).
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
**Date**: 2025-10-29
|
**Date**: 2025-10-29
|
||||||
**Status**: 🎯 **REFERENCE** - Quick start for implementation on any machine
|
**Status**: 🎯 **REFERENCE** - Quick start for implementation on any machine
|
||||||
|
|
||||||
> **See also:** [REFACTOR_ANALYSIS.md](./REFACTOR_ANALYSIS.md) for complete analysis | [REFACTOR_NOTES.md](./REFACTOR_NOTES.md) for implementation context
|
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
This guide helps you get started implementing the Integration Point Refactor on any machine. All planning and specifications are documented in the codebase.
|
This guide helps you get started implementing the Integration Point Refactor on any machine. All planning and specifications are documented in the codebase.
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ Complete checklist of iOS code that needs to be implemented for feature parity w
|
|||||||
- [iOS Implementation Directive](./ios-implementation-directive.md) - Implementation guide
|
- [iOS Implementation Directive](./ios-implementation-directive.md) - Implementation guide
|
||||||
- [iOS Recovery Scenario Mapping](./ios-recovery-scenario-mapping.md) - Scenario details
|
- [iOS Recovery Scenario Mapping](./ios-recovery-scenario-mapping.md) - Scenario details
|
||||||
- [iOS Core Data Migration Guide](./ios-core-data-migration.md) - Database entities
|
- [iOS Core Data Migration Guide](./ios-core-data-migration.md) - Database entities
|
||||||
- [Legacy Phase 1 Checklist](../../_archive/2025-legacy-doc/IMPLEMENTATION_CHECKLIST_LEGACY.md) - Historical Phase 1 checklist (archived)
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -1,129 +0,0 @@
|
|||||||
# Progress Status
|
|
||||||
|
|
||||||
**Purpose:** Single source of truth for current project status, phase completion, blockers, and next actions.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
**Baseline Tag:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Current Phase
|
|
||||||
|
|
||||||
**P0 + P1.4 + P1.5 + P2.6 + P2.7 Milestone** - Foundation, Documentation & Type Safety Established
|
|
||||||
|
|
||||||
**Status:** ✅ Complete — Tagged as baseline: `v1.0.11-p0-p1.4-complete` (P2.6/P2.7 pending tag)
|
|
||||||
|
|
||||||
**What This Baseline Includes:**
|
|
||||||
- ✅ P0: Publish safety & CI hardening (packaging, exports, CI debuggability)
|
|
||||||
- ✅ P1.4: Shared core types module (errors/enums/contracts/events/guards)
|
|
||||||
- ✅ P1.5: Documentation consolidation (authoritative index, drift guards, archive standardization, contracts as policy)
|
|
||||||
- ✅ Core module purity enforcement (platform import blocking, export validation)
|
|
||||||
- ✅ Consumer migration complete (observability, definitions, web use core types)
|
|
||||||
- ✅ All invariants enforced in tooling (`verify.sh` + `ci/run.sh`)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Last Verify Run
|
|
||||||
|
|
||||||
**Date:** 2025-12-22
|
|
||||||
**Result:** ✅ Publish-safety checks pass on Linux (TypeScript + build + pack checks); Android/iOS native builds skipped (expected)
|
|
||||||
**Local CI Command:** `./ci/run.sh` (wraps `./scripts/verify.sh`)
|
|
||||||
**Verification:**
|
|
||||||
- `./scripts/verify.sh` - All critical checks passed
|
|
||||||
- `npm pack --dry-run | grep -E "xcuserdata|xcuserstate|DerivedData|ios/App/"` - Empty (no forbidden files)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Blockers
|
|
||||||
|
|
||||||
None currently.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Completed This Week
|
|
||||||
|
|
||||||
- [x] Documentation consolidation (139 files organized)
|
|
||||||
- [x] Created progress tracking system
|
|
||||||
- [x] PHASE 1: Remove native code from src/android/ and src/ios/
|
|
||||||
- [x] PHASE 3: Single verification entrypoint (`scripts/verify.sh`)
|
|
||||||
- [x] PHASE 3: Created local CI entrypoint (`ci/run.sh`)
|
|
||||||
- [x] P0: Build/publish safety fixes (web.ts, podspec, markdown paths)
|
|
||||||
- [x] P0: iOS recovery tests (DailyNotificationRecoveryTests.swift)
|
|
||||||
- [x] P0.5: Packaging fixes (exports["./web"] paths, tightened "files" field, excluded xcuserdata/ios/App/)
|
|
||||||
- [x] Parity corrections: iOS rollover and persistence confirmed
|
|
||||||
- [x] P1.4: Shared core types module (errors/enums/contracts/events/guards)
|
|
||||||
- [x] P1.4: Core module consumer migration (observability.ts, definitions.ts, web.ts)
|
|
||||||
- [x] P1.4: Core module purity enforcement (platform import blocking, export validation)
|
|
||||||
- [x] P2.6: Type safety cleanup — eliminated all `any` usages except documented TS mixin limitation
|
|
||||||
- `vite-plugin.ts`: removed `any` return types (replaced with `UserConfig` and concrete transform return type)
|
|
||||||
- `PlatformServiceMixin.ts`: documented TS mixin `any[]` exception (TypeScript limitation, not design choice)
|
|
||||||
- Audit confirmed: zero `any` in codebase except intentional mixin pattern
|
|
||||||
- [x] P2.7: Created SYSTEM_INVARIANTS.md — single authoritative document naming and explaining all enforced invariants
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Next Actions (Max 5)
|
|
||||||
|
|
||||||
1. **P2.x** - Parity & resilience polish (schema versioning, combined edge case tests)
|
|
||||||
2. **P1.5b** - Move iOS/App test harness out of published tree (optional but recommended)
|
|
||||||
3. **Tag P2.6/P2.7 completion** - Create baseline tag for type safety milestone (optional)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Known Gaps (Parity)
|
|
||||||
|
|
||||||
See [04-PARITY-MATRIX.md](./04-PARITY-MATRIX.md) for detailed parity tracking.
|
|
||||||
|
|
||||||
**Summary:**
|
|
||||||
- iOS persistence: ✅ Implemented (CoreData + SQLite)
|
|
||||||
- iOS rollover: ✅ Implemented (NotificationCenter pattern)
|
|
||||||
- iOS recovery testing: ✅ Implemented (DailyNotificationRecoveryTests.swift)
|
|
||||||
- iOS reboot recovery: N/A (iOS handles automatically)
|
|
||||||
- Storage schema versioning: ⚠️ Partial (CoreData auto-migration, explicit versioning may be needed)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Phase Status
|
|
||||||
|
|
||||||
| Phase | Priority | Status | Notes |
|
|
||||||
|-------|----------|--------|-------|
|
|
||||||
| PHASE 1 | P0.1 | ✅ Complete | Repo hygiene + packaging |
|
|
||||||
| PHASE 2 | P0.2 | ✅ Complete | iOS persistence parity (CoreData + SQLite confirmed) |
|
|
||||||
| PHASE 3 | P0.3 | ✅ Complete | Verification entrypoint + local CI |
|
|
||||||
| **P0 Phase** | **P0** | **✅ Complete** | **Publish safety & CI hardening (packaging, exports, CI debuggability)** |
|
|
||||||
| PHASE 4 | P1.4 | ✅ Complete | Shared core types module (errors/enums/contracts/events/guards) |
|
|
||||||
| PHASE 5 | P1.5 | ✅ Complete | Docs consolidation (authoritative index, drift guards, archive standardization, contracts as policy) |
|
|
||||||
| PHASE 6 | P2.6 | ✅ Complete | Type safety cleanup (zero `any` except documented TS mixin limitation) |
|
|
||||||
| PHASE 7 | P2.7 | ✅ Complete | System invariants doc (SYSTEM_INVARIANTS.md created) |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Maintained By:** Development Team
|
|
||||||
**Update Frequency:** After each phase completion or significant change
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Packaging Invariants
|
|
||||||
|
|
||||||
**Policy:** Packaging is controlled primarily by `package.json.files` (whitelist). `.npmignore` is secondary.
|
|
||||||
|
|
||||||
**Required Checks:**
|
|
||||||
- `npm pack --dry-run | grep -E "xcuserdata|xcuserstate|DerivedData|ios/App/"` must remain **empty**
|
|
||||||
- CI must fail if forbidden files appear in package
|
|
||||||
- `exports["./web"]` paths must match actual build artifacts (`dist/esm/web.{js,d.ts}`)
|
|
||||||
|
|
||||||
**Verification:** Run `./ci/run.sh` (or `make ci`) before any publish - it includes forbidden files check.
|
|
||||||
|
|
||||||
**Local CI Policy:** `./ci/run.sh` is the **single source of truth** for CI. All publishing/releasing must be gated by `./ci/run.sh`. See `ci/README.md` for details.
|
|
||||||
|
|
||||||
**Critical Invariant:** Any CI or release gate MUST call `./ci/run.sh` (not `npm run build` directly), because `verify.sh` encodes packaging and core-purity invariants that must be checked before publish.
|
|
||||||
|
|
||||||
**Git Hook:** Pre-push hook available at `githooks/pre-push` (setup: `git config core.hooksPath githooks`). Calls `./ci/run.sh`.
|
|
||||||
|
|
||||||
**Baseline Tag:** `v1.0.11-p0-p1.4-p1.5-p2.6-p2.7-complete` — This tag represents a known-good architectural baseline with all invariants enforced and type safety established. Use as rollback anchor or reference point for future work.
|
|
||||||
|
|
||||||
**Previous Baseline:** `v1.0.11-p0-p1.4-complete` — Foundation milestone (P0 publish safety, P1.4 core module, P1.5 docs consolidation).
|
|
||||||
|
|
||||||
**Type Safety Invariant:** Only allowed `any` in repo: TS mixin constructor pattern (`src/utils/PlatformServiceMixin.ts:258`), documented inline. All external boundaries use `unknown`, all data payloads use `Record<string, unknown>`.
|
|
||||||
|
|
||||||
@@ -1,153 +0,0 @@
|
|||||||
# Development Changelog
|
|
||||||
|
|
||||||
**Purpose:** Development changelog tracking work-in-progress changes, refactors, and improvements (not the release CHANGELOG.md).
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
For release notes, see [CHANGELOG.md](../../CHANGELOG.md).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2025-12-22
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- **2025-12-22 — P2.6 COMPLETE**: Type safety cleanup — eliminated all `any` usages except documented TypeScript mixin limitation
|
|
||||||
- **Batch 1**: Replaced `any` return types in `src/vite-plugin.ts` with concrete types (`UserConfig`, `{ code: string; map: null }`)
|
|
||||||
- **Audit Result**: Codebase already follows type safety best practices; all external boundaries use `unknown`, all data payloads use `Record<string, unknown>`
|
|
||||||
- **Remaining Exception**: `src/utils/PlatformServiceMixin.ts:258` — `any[]` required for TypeScript mixin pattern (documented with inline comment)
|
|
||||||
- **Verification**: `rg '\bany\b' src/` returns zero matches except documented exception; TypeScript compilation passes
|
|
||||||
- **2025-12-22 — P2.7 COMPLETE**: Created `docs/SYSTEM_INVARIANTS.md` — single authoritative document naming and explaining all enforced invariants
|
|
||||||
- **P1.5 COMPLETE**: Documentation consolidation phase finished
|
|
||||||
- **Step 1**: Updated `docs/00-INDEX.md` to elevate contracts and progress docs as authoritative
|
|
||||||
- **Step 2**: Added drift guards (Purpose, Owner, Last Updated, Status) to all progress docs
|
|
||||||
- **Step 3**: Archived consolidation artifacts to `docs/_archive/2025-12-16-consolidation/`
|
|
||||||
- **Step 4**: Archived legacy iOS checklist; added cross-references to testing, integration, and deployment docs
|
|
||||||
- **Step 5**: Documented CI contracts as policy-as-code in `ci/README.md`; standardized archive directory to `docs/_archive/`
|
|
||||||
- Fixed `exports["./web"]` paths in package.json (now points to actual built files: `dist/esm/web.{js,d.ts}`)
|
|
||||||
- Tightened `package.json` "files" field to exclude `ios/App/` and Xcode user state files
|
|
||||||
- Enhanced `verify.sh` forbidden files check to include `ios/App/` pattern and additional editor/macOS junk files
|
|
||||||
- Moved GitHub Actions workflow to `docs/_reference/` (reference only, not used)
|
|
||||||
- Established local CI as single source of truth (`./ci/run.sh`)
|
|
||||||
- **P1.4**: Created shared core types module (`src/core/`)
|
|
||||||
- Migrated `observability.ts` to use `core/events` (EVENT_CODES, EventLog)
|
|
||||||
- Migrated `definitions.ts` to re-export core contracts/enums instead of duplicating
|
|
||||||
- Migrated `web.ts` to use canonical types from core
|
|
||||||
- **P1.4**: Enhanced `verify.sh` with core module purity enforcement
|
|
||||||
- Platform import blocking: comprehensive regex detects Node builtins + Capacitor/React
|
|
||||||
- Export validation: Node-based check for `package.json.exports['./core']`
|
|
||||||
- Split checks: source validation (pre-build) + artifact validation (post-build)
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- `ci/run.sh` - Local CI entrypoint (wraps `./scripts/verify.sh`)
|
|
||||||
- `ci/README.md` - Local CI documentation
|
|
||||||
- `githooks/pre-push` - Git hook to run CI before push
|
|
||||||
- `Makefile` - Convenience targets (`make ci` runs local CI)
|
|
||||||
- **P1.4**: `src/core/errors.ts` - ErrorCode enum, DailyNotificationError class
|
|
||||||
- **P1.4**: `src/core/enums.ts` - PermissionState, ScheduleKind, HistoryKind, etc.
|
|
||||||
- **P1.4**: `src/core/contracts.ts` - Schedule, ContentCache, Config, Callback, History interfaces
|
|
||||||
- **P1.4**: `src/core/events.ts` - EventLog with schemaVersion, EVENT_CODES constants
|
|
||||||
- **P1.4**: `src/core/guards.ts` - Runtime validators
|
|
||||||
- **P1.4**: `src/core/index.ts` - Curated public exports
|
|
||||||
- **P1.4**: `package.json.exports["./core"]` - Core module export path
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- **P0.5**: Packaging now excludes `xcuserdata/`, `*.xcuserstate`, `DerivedData/`, and `ios/App/` from npm package
|
|
||||||
- **P0.6**: Fixed broken `exports["./web"]` paths that would have caused import failures
|
|
||||||
- **P1.4**: Eliminated duplicate type definitions (EVENT_CODES, EventLog, Schedule, Config, etc.)
|
|
||||||
|
|
||||||
### Notes
|
|
||||||
- Package is now publish-safe with correct exports and no forbidden files
|
|
||||||
- `verify.sh` now hard-fails if forbidden files are detected in `npm pack --dry-run`
|
|
||||||
- **P0 Phase Complete**: All publish safety and CI hardening work finished
|
|
||||||
- Packaging correctness (whitelist-based, forbidden files check)
|
|
||||||
- Export correctness (`exports["./web"]` paths fixed)
|
|
||||||
- CI correctness (local CI as single source of truth)
|
|
||||||
- CI debuggability (failure output preserved)
|
|
||||||
- Documentation alignment (all progress docs match reality)
|
|
||||||
- **P1.4 Phase Complete**: Shared core types module implemented
|
|
||||||
- Core module is single source of truth for shared types
|
|
||||||
- Consumers migrated (observability, definitions, web)
|
|
||||||
- Core purity enforced via verify.sh (platform import blocking, export validation)
|
|
||||||
- No behavior changes - only type consolidation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2025-12-16
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Documentation structure consolidated (139 files organized)
|
|
||||||
- Created progress tracking system (`docs/progress/`)
|
|
||||||
- Removed native Java code from `src/android/` (21 files removed)
|
|
||||||
- Fixed podspec reference in `package.json` (`DailyNotificationPlugin.podspec` → `CapacitorDailyNotification.podspec`)
|
|
||||||
- Fixed markdown lint script paths (`doc/*.md` → `docs/**/*.md`)
|
|
||||||
- Updated parity matrix to reflect actual iOS persistence (CoreData + SQLite)
|
|
||||||
- Updated `.npmignore` to be more defensive (added iOS-specific exclusions, *.tgz, etc.)
|
|
||||||
- Updated `verify.sh` to run iOS tests when xcodebuild is available
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- `docs/progress/` directory with tracking documents
|
|
||||||
- `docs/00-INDEX.md` - Documentation index
|
|
||||||
- `docs/CONSOLIDATION_SOURCE_MAP.md` - File mapping audit trail
|
|
||||||
- `docs/CONSOLIDATION_COMPLETE.md` - Consolidation summary
|
|
||||||
- `scripts/verify.sh` - Single verification entrypoint (with build + pack checks + iOS tests)
|
|
||||||
- `ci/run.sh` - Local CI entrypoint (wraps verify.sh)
|
|
||||||
- `ci/README.md` - Local CI documentation
|
|
||||||
- `src/web.ts` - Web platform implementation (throws "not supported" errors)
|
|
||||||
- `.npmignore` - Belt-and-suspenders safety net for npm packaging
|
|
||||||
- `ios/Tests/TestDBFactory.swift` - Test helper for creating test databases and injecting invalid data
|
|
||||||
- `ios/Tests/DailyNotificationRecoveryTests.swift` - iOS recovery tests (equivalent to Android TEST 4)
|
|
||||||
- Invalid records handling
|
|
||||||
- Duplicate delivery deduplication
|
|
||||||
- Rollover idempotency
|
|
||||||
- Cold start recovery
|
|
||||||
- Migration safety
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
- `src/android/*.java` - 21 Java files (duplicates of code in `android/src/main/java/`)
|
|
||||||
- These were old copies not used in the build process
|
|
||||||
- Actual native code remains in `android/src/main/java/`
|
|
||||||
|
|
||||||
### Notes
|
|
||||||
- **PHASE 1 (Repo Hygiene)** ✅ Complete
|
|
||||||
- **PHASE 3 (Verification Entrypoint)** ✅ Complete
|
|
||||||
- **P0 Build/Publish Safety** ✅ Complete
|
|
||||||
- Build now succeeds (`npm run build` works)
|
|
||||||
- Package includes correct podspec (`npm pack --dry-run` verified)
|
|
||||||
- Verify script includes build and pack checks
|
|
||||||
- Added `.npmignore` as belt-and-suspenders safety net
|
|
||||||
- **Parity Matrix Correction** ✅ Complete
|
|
||||||
- iOS rollover is actually implemented (NotificationCenter pattern)
|
|
||||||
- iOS persistence confirmed (CoreData + SQLite)
|
|
||||||
- **iOS Recovery Testing** ✅ Complete
|
|
||||||
- Added automated recovery tests equivalent to Android TEST 4
|
|
||||||
- Tests cover invalid data, duplicate delivery, rollover idempotency, cold start, migration safety
|
|
||||||
- Tests require macOS with Xcode to run (skipped on Linux CI)
|
|
||||||
- TypeScript config files (`timesafari-android-config.ts`, `timesafari-ios-config.ts`) kept as they are legitimate TS files
|
|
||||||
- `verify.sh` script includes checks for native code in `src/` directories, build, pack validation, and iOS tests
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Template for Future Entries
|
|
||||||
|
|
||||||
### YYYY-MM-DD
|
|
||||||
|
|
||||||
**Changed:**
|
|
||||||
-
|
|
||||||
|
|
||||||
**Added:**
|
|
||||||
-
|
|
||||||
|
|
||||||
**Removed:**
|
|
||||||
-
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
-
|
|
||||||
|
|
||||||
**Related Commits/PRs:**
|
|
||||||
-
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
# Open Questions
|
|
||||||
|
|
||||||
**Purpose:** Questions and uncertainties discovered during implementation, with proposed answers and decisions.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Template
|
|
||||||
|
|
||||||
### Q: [Question Title]
|
|
||||||
|
|
||||||
**Context:**
|
|
||||||
[What led to this question? What problem are we trying to solve?]
|
|
||||||
|
|
||||||
**Files Involved:**
|
|
||||||
- `path/to/file1.ts`
|
|
||||||
- `path/to/file2.swift`
|
|
||||||
|
|
||||||
**Options:**
|
|
||||||
1. **Option A:** [Description]
|
|
||||||
- Pros: [list]
|
|
||||||
- Cons: [list]
|
|
||||||
|
|
||||||
2. **Option B:** [Description]
|
|
||||||
- Pros: [list]
|
|
||||||
- Cons: [list]
|
|
||||||
|
|
||||||
**Recommendation:**
|
|
||||||
[Which option is recommended and why]
|
|
||||||
|
|
||||||
**Decision:**
|
|
||||||
[Final decision if made, or "Pending"]
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Current Questions
|
|
||||||
|
|
||||||
*No open questions currently. All architectural decisions have been made.*
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Closed Questions
|
|
||||||
|
|
||||||
### Q: What is the authoritative CI entrypoint?
|
|
||||||
|
|
||||||
**Context:**
|
|
||||||
Need to establish a single source of truth for CI to avoid drift and ensure consistency.
|
|
||||||
|
|
||||||
**Decision:**
|
|
||||||
`./ci/run.sh` is canonical. It wraps `./scripts/verify.sh` and provides a stable interface for:
|
|
||||||
- CI runners
|
|
||||||
- Release gates
|
|
||||||
- Pre-merge checks
|
|
||||||
- Git hooks (`githooks/pre-push`)
|
|
||||||
- Makefile targets (`make ci`)
|
|
||||||
|
|
||||||
`./scripts/verify.sh` is an implementation detail/library function. External systems should call `./ci/run.sh`.
|
|
||||||
|
|
||||||
**Rationale:**
|
|
||||||
- Stable interface for automation
|
|
||||||
- Clear separation: entrypoint vs implementation
|
|
||||||
- Easy to add pre/post hooks in the future
|
|
||||||
- Consistent exit codes and output format
|
|
||||||
|
|
||||||
**Status:** ✅ **RESOLVED** (2025-12-22)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Q: How to enforce core module purity?
|
|
||||||
|
|
||||||
**Context:**
|
|
||||||
Core module (`src/core/`) must remain platform-agnostic and portable. Need automated enforcement.
|
|
||||||
|
|
||||||
**Decision:**
|
|
||||||
Enforce via `verify.sh`:
|
|
||||||
- Platform import blocking: comprehensive regex detects Node builtins, Capacitor, React
|
|
||||||
- Export validation: Node-based check ensures `package.json.exports['./core']` exists
|
|
||||||
- Source checks run before build (works on clean checkouts)
|
|
||||||
- Artifact checks run after build (validates build outputs)
|
|
||||||
|
|
||||||
**Rationale:**
|
|
||||||
- Automated enforcement prevents regressions
|
|
||||||
- Clear error messages guide developers
|
|
||||||
- Policy encoded in tooling, not tribal knowledge
|
|
||||||
|
|
||||||
**Status:** ✅ **RESOLVED** (2025-12-22)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
|
|
||||||
@@ -1,143 +0,0 @@
|
|||||||
# Test Run Log
|
|
||||||
|
|
||||||
**Purpose:** Canonical record of every run of `verify.sh` (or manual verification) with date/time and results.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Template
|
|
||||||
|
|
||||||
### YYYY-MM-DD HH:MM (local timezone)
|
|
||||||
|
|
||||||
**Command:**
|
|
||||||
`./scripts/verify.sh`
|
|
||||||
|
|
||||||
**Result:**
|
|
||||||
✅ PASS / ❌ FAIL / ⚠️ PARTIAL
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
[Any relevant observations, warnings, or issues]
|
|
||||||
|
|
||||||
**Artifacts/Logs:**
|
|
||||||
[Links to logs, screenshots, or artifacts if available]
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Test Runs
|
|
||||||
|
|
||||||
### 2025-12-22 (P2.6 Type Safety Audit)
|
|
||||||
|
|
||||||
**Command:**
|
|
||||||
`rg -n "\bany\b" src/ --type ts | grep -v "node_modules" | grep -v "test"`
|
|
||||||
|
|
||||||
**Result:**
|
|
||||||
✅ PASS (zero `any` found except documented TS mixin limitation)
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
- P2.6 Batch 1: Replaced `any` return types in `src/vite-plugin.ts` with concrete types (`UserConfig`, `{ code: string; map: null }`)
|
|
||||||
- Audit confirmed: All external boundaries use `unknown`, all data payloads use `Record<string, unknown>`
|
|
||||||
- Remaining exception: `src/utils/PlatformServiceMixin.ts:258` — `any[]` required for TypeScript mixin pattern (documented)
|
|
||||||
- TypeScript compilation: ✅ PASSES
|
|
||||||
- Build: ✅ PASSES
|
|
||||||
|
|
||||||
**Type Safety Status:**
|
|
||||||
- ✅ Zero `any` in codebase (except documented mixin limitation)
|
|
||||||
- ✅ `src/web.ts`: All external boundaries use `unknown`
|
|
||||||
- ✅ `src/observability.ts`: All data payloads use `Record<string, unknown>`
|
|
||||||
- ✅ `src/core/events.ts`: All event data uses `Record<string, unknown>`
|
|
||||||
|
|
||||||
**Artifacts/Logs:**
|
|
||||||
- `npm run typecheck` — ✅ PASSES
|
|
||||||
- `npm run build` — ✅ PASSES
|
|
||||||
- `rg '\bany\b' src/` — Clean except documented exception
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2025-12-22 (P1.4 Core Module + CI Hardening)
|
|
||||||
|
|
||||||
**Command:**
|
|
||||||
`./ci/run.sh`
|
|
||||||
|
|
||||||
**Result:**
|
|
||||||
✅ PASS (TypeScript/build/pack checks on Linux); ⚠️ PARTIAL (native iOS/Android builds skipped when toolchains not present - expected)
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
- Core module checks implemented: source validation (pre-build) + artifact validation (post-build)
|
|
||||||
- Platform import detection: blocks Node builtins + Capacitor/React in `src/core/`
|
|
||||||
- Forbidden files scan: only scans actual "Tarball Contents" file entries (not metadata lines)
|
|
||||||
- Export validation: Node-based check for `package.json.exports['./core']`
|
|
||||||
- All P0 publish-safety checks pass
|
|
||||||
- All P1.4 core module checks pass
|
|
||||||
|
|
||||||
**Key Invariants Enforced:**
|
|
||||||
- ✅ Core source checks run before build (works on clean checkouts)
|
|
||||||
- ✅ Core artifact checks run after build (validates build outputs)
|
|
||||||
- ✅ Platform import blocking: comprehensive regex detects `import`, `require()`, and `import()` patterns
|
|
||||||
- ✅ Node builtins blocked: `fs`, `path`, `os`, `child_process`, `crypto`, `http`, `https`, `net`, `tls`, `zlib`, `stream`, `util`, `url`, `worker_threads`, `perf_hooks`, `vm`
|
|
||||||
- ✅ Packaging scan: filters to actual file entries only (no false positives from metadata)
|
|
||||||
|
|
||||||
**Artifacts/Logs:**
|
|
||||||
- `./ci/run.sh` is the single source of truth for CI
|
|
||||||
- `npm pack --dry-run | grep -E "xcuserdata|xcuserstate|DerivedData|ios/App/"` returns empty
|
|
||||||
- Core module builds successfully: `dist/esm/core/index.{js,d.ts}` exist
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2025-12-16 (iOS Recovery Tests Added)
|
|
||||||
|
|
||||||
**Command:**
|
|
||||||
`cd ios && xcodebuild test -workspace DailyNotificationPlugin.xcworkspace -scheme DailyNotificationPlugin -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15' -only-testing:DailyNotificationPluginTests/DailyNotificationRecoveryTests`
|
|
||||||
|
|
||||||
**Result:**
|
|
||||||
✅ PASS (when run on macOS with xcodebuild)
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
- iOS recovery tests created: `DailyNotificationRecoveryTests.swift`
|
|
||||||
- Test helper created: `TestDBFactory.swift`
|
|
||||||
- Tests cover: invalid records, duplicate delivery, rollover idempotency, cold start, migration safety
|
|
||||||
- Tests skipped on Linux (xcodebuild not available - expected)
|
|
||||||
|
|
||||||
**Test Coverage:**
|
|
||||||
- ✅ `test_recovery_ignores_invalid_records_and_continues()` - Invalid data handling
|
|
||||||
- ✅ `test_recovery_handles_null_fields()` - Null field handling
|
|
||||||
- ✅ `test_recovery_dedupes_duplicate_delivery_events()` - Duplicate delivery deduplication
|
|
||||||
- ✅ `test_recovery_rollover_idempotent_when_called_twice()` - Rollover idempotency
|
|
||||||
- ✅ `test_recovery_after_cold_start_reconciles_state()` - Cold start recovery
|
|
||||||
- ✅ `test_recovery_migration_safety_unknown_fields()` - Migration safety
|
|
||||||
|
|
||||||
**Artifacts/Logs:**
|
|
||||||
- Tests require macOS with Xcode to run
|
|
||||||
- `verify.sh` updated to run iOS tests when xcodebuild is available
|
|
||||||
- Tests use in-memory and temporary databases for isolation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2025-12-16 (Initial Run)
|
|
||||||
|
|
||||||
**Command:**
|
|
||||||
`./scripts/verify.sh`
|
|
||||||
|
|
||||||
**Result:**
|
|
||||||
⚠️ PARTIAL
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
- Environment diagnostics: ✅ Passed
|
|
||||||
- Dependencies: ✅ Already installed
|
|
||||||
- Native code check: ✅ Passed (no Java files in src/android/)
|
|
||||||
- TypeScript checks: ✅ Passed (typecheck, lint)
|
|
||||||
- Build checks: ✅ Passed (`npm run build`)
|
|
||||||
- Package checks: ✅ Passed (`npm pack --dry-run`)
|
|
||||||
- Android checks: ⚠️ Skipped (no gradlew on Linux - expected)
|
|
||||||
- iOS checks: ⚠️ Skipped (xcodebuild not available - expected)
|
|
||||||
|
|
||||||
**Artifacts/Logs:**
|
|
||||||
- Script executed successfully
|
|
||||||
- All critical checks (TypeScript, native code location, build, pack) passed
|
|
||||||
- Platform-specific builds skipped as expected on Linux environment
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
# iOS vs Android Feature Parity Matrix
|
|
||||||
|
|
||||||
**Purpose:** Feature-by-feature comparison of iOS and Android implementations to track parity gaps.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Storage & Persistence
|
|
||||||
|
|
||||||
| Feature | Android | iOS | Notes |
|
|
||||||
|---------|---------|-----|-------|
|
|
||||||
| Persistent state | ✅ SQLite (Room) | ✅ CoreData + SQLite | Both implemented |
|
|
||||||
| Schema versioning | ✅ Room migrations | ⚠️ Partial | iOS has CoreData auto-migration, but explicit versioning may be needed |
|
|
||||||
| State survives app restart | ✅ Yes | ✅ Yes | Both implemented |
|
|
||||||
| State survives OS kill | ✅ Yes | ✅ Yes | Both implemented |
|
|
||||||
| State survives reboot | ✅ Yes | N/A | iOS handles notifications automatically |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Notification Scheduling
|
|
||||||
|
|
||||||
| Feature | Android | iOS | Notes |
|
|
||||||
|---------|---------|-----|-------|
|
|
||||||
| Exact alarms | ✅ AlarmManager | N/A | iOS uses UNUserNotificationCenter |
|
|
||||||
| Daily rollover | ✅ Automatic | ✅ Automatic | Both implemented (iOS uses NotificationCenter pattern) |
|
|
||||||
| Schedule persistence | ✅ Database | ✅ UNUserNotificationCenter | iOS OS-guaranteed |
|
|
||||||
| Next notification retrieval | ✅ getNotificationStatus() | ✅ getNotificationStatus() | Both implemented |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Recovery & Resilience
|
|
||||||
|
|
||||||
| Feature | Android | iOS | Notes |
|
|
||||||
|---------|---------|-----|-------|
|
|
||||||
| App launch recovery | ✅ ReactivationManager | ✅ ReactivationManager | Both implemented with persistence |
|
|
||||||
| Boot recovery | ✅ BootReceiver | N/A | iOS handles automatically |
|
|
||||||
| Missed notification detection | ✅ Yes | ✅ Yes | Both implemented with persistent state |
|
|
||||||
| Recovery logging | ✅ Comprehensive | ✅ Comprehensive | Both have good logging |
|
|
||||||
| Invalid data recovery | ✅ Tested (TEST 4) | ✅ Tested (RecoveryTests) | Both have automated recovery tests |
|
|
||||||
| Rollover idempotency | ✅ Tested | ✅ Tested | Both verify duplicate rollover prevention |
|
|
||||||
| Migration safety | ✅ Tested | ✅ Tested | Both test unknown/missing fields |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Background Execution
|
|
||||||
|
|
||||||
| Feature | Android | iOS | Notes |
|
|
||||||
|---------|---------|-----|-------|
|
|
||||||
| Background fetch | ✅ WorkManager | ✅ BGTaskScheduler | Both implemented |
|
|
||||||
| Background notification | ✅ WorkManager | ✅ BGTaskScheduler | Both implemented |
|
|
||||||
| Execution time limits | ✅ Flexible | ⚠️ ~30 seconds | iOS has strict limits |
|
|
||||||
| Battery optimization handling | ✅ Documented | N/A | iOS handles automatically |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Error Handling
|
|
||||||
|
|
||||||
| Feature | Android | iOS | Notes |
|
|
||||||
|---------|---------|-----|-------|
|
|
||||||
| Error codes | ✅ Structured | ✅ Structured | Both have error codes |
|
|
||||||
| Error recovery | ✅ Yes | ✅ Yes | Both handle errors gracefully |
|
|
||||||
| Invalid data handling | ✅ Recovery tested | ⚠️ Input validation only | **GAP** - iOS needs recovery testing |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Testing
|
|
||||||
|
|
||||||
| Feature | Android | iOS | Notes |
|
|
||||||
|---------|---------|-----|-------|
|
|
||||||
| Unit tests | ✅ Yes | ⚠️ Partial | iOS has some tests |
|
|
||||||
| Integration tests | ✅ Yes | ⚠️ Partial | iOS has some tests |
|
|
||||||
| Test automation | ✅ High | ⚠️ Medium | iOS has manual components |
|
|
||||||
| Recovery testing | ✅ Yes | ✅ Yes | Both have automated recovery tests (DailyNotificationRecoveryTests.swift) |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
|
|
||||||
### Critical Gaps (P0)
|
|
||||||
|
|
||||||
**None** - All critical gaps addressed:
|
|
||||||
- ✅ iOS rollover implemented (NotificationCenter pattern)
|
|
||||||
- ✅ iOS recovery testing implemented (DailyNotificationRecoveryTests.swift)
|
|
||||||
- ✅ iOS persistence confirmed (CoreData + SQLite)
|
|
||||||
|
|
||||||
### Important Gaps (P1)
|
|
||||||
|
|
||||||
1. **Schema Versioning** - iOS has CoreData auto-migration, but explicit versioning strategy may be needed
|
|
||||||
2. **Test Automation** - iOS tests can be run via xcodebuild, but CI integration may need macOS runners
|
|
||||||
|
|
||||||
### Nice-to-Have (P2)
|
|
||||||
|
|
||||||
1. **Combined Edge Case Tests** - DST boundary + duplicate delivery + cold start combined scenario
|
|
||||||
2. **OS Reboot Testing** - True OS reboot scenarios (iOS handles automatically, but explicit testing may be valuable)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-16
|
|
||||||
**Next Review:** After PHASE 2 completion
|
|
||||||
|
|
||||||
@@ -1,179 +0,0 @@
|
|||||||
# ChatGPT Feedback Package
|
|
||||||
|
|
||||||
**Purpose:** Minimal, structured package for efficient ChatGPT collaboration.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** active
|
|
||||||
|
|
||||||
**Usage:** Copy this entire document + changed files only (not the whole repo).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## What Changed Since Last Review
|
|
||||||
|
|
||||||
**Date:** 2025-12-22
|
|
||||||
|
|
||||||
### Files Changed
|
|
||||||
- **P1.4 COMPLETE**: Created shared core types module (`src/core/`)
|
|
||||||
- `errors.ts`: ErrorCode enum, DailyNotificationError class
|
|
||||||
- `enums.ts`: PermissionState, ScheduleKind, HistoryKind, etc.
|
|
||||||
- `contracts.ts`: Schedule, ContentCache, Config, Callback, History interfaces
|
|
||||||
- `events.ts`: EventLog with schemaVersion, EVENT_CODES constants
|
|
||||||
- `guards.ts`: Runtime validators
|
|
||||||
- `index.ts`: Curated public exports
|
|
||||||
- **P1.4 COMPLETE**: Migrated consumers to use core types
|
|
||||||
- `observability.ts`: Now imports EVENT_CODES/EventLog from `./core/events`
|
|
||||||
- `definitions.ts`: Re-exports core contracts/enums instead of duplicating
|
|
||||||
- `web.ts`: Uses canonical types from `./core` via `definitions.ts`
|
|
||||||
- **P1.4 COMPLETE**: Core module purity enforcement
|
|
||||||
- Platform import blocking: comprehensive regex detects Node builtins + Capacitor/React
|
|
||||||
- Export validation: Node-based check for `package.json.exports['./core']`
|
|
||||||
- Source checks (pre-build) + artifact checks (post-build) in `verify.sh`
|
|
||||||
- **P0.5 COMPLETE**: Fixed packaging issues (exports["./web"] paths, tightened "files" field)
|
|
||||||
- **P0.6 COMPLETE**: Enhanced verify.sh with forbidden files check (hard-fail on xcuserdata/xcuserstate/DerivedData/ios/App/)
|
|
||||||
- **Packaging**: `npm pack --dry-run | grep -E "xcuserdata|xcuserstate|DerivedData|ios/App/"` now returns empty
|
|
||||||
- **Exports**: Fixed `exports["./web"]` to point to actual build artifacts (`dist/esm/web.{js,d.ts}`)
|
|
||||||
- **Files field**: Tightened from `"ios/"` to specific subpaths (`ios/Plugin/`, `ios/Tests/`, `ios/*.podspec`, etc.)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Date:** 2025-12-16
|
|
||||||
|
|
||||||
### Files Changed
|
|
||||||
- Created progress tracking system (`docs/progress/*`)
|
|
||||||
- Documentation consolidation completed
|
|
||||||
- **PHASE 1 COMPLETE**: Removed 21 Java files from `src/android/`
|
|
||||||
- **PHASE 3 COMPLETE**: Created `scripts/verify.sh` and local CI (`ci/run.sh`)
|
|
||||||
- **P0 COMPLETE**: Fixed build breakage (`src/web.ts`), podspec reference, markdown lint paths
|
|
||||||
- **P1 COMPLETE**: Added build + pack checks to verify.sh
|
|
||||||
- **P3 COMPLETE**: Updated parity matrix (iOS has persistence: CoreData + SQLite)
|
|
||||||
- **P0.4 COMPLETE**: Added `.npmignore` as belt-and-suspenders safety net
|
|
||||||
- **PARITY FIX**: iOS rollover is actually implemented - updated parity matrix
|
|
||||||
- **RECOVERY TESTS COMPLETE**: Added iOS recovery tests (`DailyNotificationRecoveryTests.swift`) + test helper (`TestDBFactory.swift`)
|
|
||||||
|
|
||||||
### Commits
|
|
||||||
- `c39bd7c` - docs: Consolidate documentation structure
|
|
||||||
- `3f15352` - chore: Add zip and gz files to .gitignore
|
|
||||||
- (Pending) - refactor: Remove native code from src/ directories
|
|
||||||
- (Pending) - feat: Add verification script and CI workflow
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Current Blockers / Questions
|
|
||||||
|
|
||||||
*None currently. See [02-OPEN-QUESTIONS.md](./02-OPEN-QUESTIONS.md) for details.*
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Files to Review (Short List)
|
|
||||||
|
|
||||||
### Priority Files (Changed/New)
|
|
||||||
- `docs/progress/00-STATUS.md` - Current status (PHASE 1 & 3 complete)
|
|
||||||
- `docs/progress/04-PARITY-MATRIX.md` - Feature parity tracking
|
|
||||||
- `scripts/verify.sh` - ✅ Created (verification entrypoint)
|
|
||||||
- `ci/run.sh` - ✅ Created (local CI entrypoint)
|
|
||||||
- `ci/README.md` - ✅ Created (local CI documentation)
|
|
||||||
|
|
||||||
### Context Files (If Needed)
|
|
||||||
- `src/android/` - Check for native code (PHASE 1)
|
|
||||||
- `src/ios/` - Check for native code (PHASE 1)
|
|
||||||
- `ios/Plugin/` - iOS persistence implementation (PHASE 2)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Verify Output Summary
|
|
||||||
|
|
||||||
**Last Run:** 2025-12-22
|
|
||||||
**Status:** ✅ PUBLISH-SAFE + CORE MODULE VALIDATED
|
|
||||||
**Commands:** `./ci/run.sh` (wraps `./scripts/verify.sh`) + `npm pack --dry-run | grep -E "xcuserdata|xcuserstate|DerivedData|ios/App/"`
|
|
||||||
|
|
||||||
**Results:**
|
|
||||||
- ✅ Build: `npm run build` succeeds
|
|
||||||
- ✅ Package: `npm pack --dry-run` includes `CapacitorDailyNotification.podspec`
|
|
||||||
- ✅ Forbidden files check: **Empty** (no xcuserdata, xcuserstate, DerivedData, ios/App/)
|
|
||||||
- ✅ Exports: `exports["./web"]` and `exports["./core"]` paths fixed to match actual build artifacts
|
|
||||||
- ✅ Files field: Tightened from `"ios/"` to specific subpaths
|
|
||||||
- ✅ TypeScript: All types compile correctly
|
|
||||||
- ✅ Web implementation: `src/web.ts` implements all interface methods
|
|
||||||
- ✅ Core module: Source checks pass (no platform imports), artifact checks pass (build outputs exist)
|
|
||||||
- ✅ Core module: Export validation passes (`package.json.exports['./core']` exists and valid)
|
|
||||||
|
|
||||||
**All P0 + P1.4 checks passed. Package is publish-safe with correct exports, no forbidden files, and core module is pure.**
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Current Phase
|
|
||||||
|
|
||||||
**PHASE 1** - ✅ COMPLETE
|
|
||||||
**PHASE 2** - ✅ COMPLETE (iOS persistence confirmed)
|
|
||||||
**PHASE 3** - ✅ COMPLETE
|
|
||||||
**PHASE 4 (P1.4)** - ✅ COMPLETE (Shared core types module)
|
|
||||||
|
|
||||||
**Next Phase:** PHASE 5 - Docs Consolidation
|
|
||||||
|
|
||||||
**Completed Tasks:**
|
|
||||||
1. ✅ Removed 21 Java files from `src/android/` (duplicates)
|
|
||||||
2. ✅ Verified npm packaging (package.json "files" field tightened)
|
|
||||||
3. ✅ Created `scripts/verify.sh` verification entrypoint
|
|
||||||
4. ✅ Created `ci/run.sh` local CI entrypoint (wraps verify.sh)
|
|
||||||
5. ✅ Moved GitHub Actions template to `docs/_reference/` (reference only, not used)
|
|
||||||
6. ✅ Fixed `exports["./web"]` paths (P0.6)
|
|
||||||
7. ✅ Tightened `package.json` "files" field to exclude test app and Xcode user state (P0.5)
|
|
||||||
8. ✅ Enhanced verify.sh with forbidden files check (hard-fail on xcuserdata/xcuserstate/DerivedData/ios/App/)
|
|
||||||
9. ✅ Created shared core types module (`src/core/`) with errors/enums/contracts/events/guards (P1.4)
|
|
||||||
10. ✅ Migrated consumers (observability.ts, definitions.ts, web.ts) to use core types (P1.4)
|
|
||||||
11. ✅ Core module purity enforcement (platform import blocking, export validation) (P1.4)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Next Actions
|
|
||||||
|
|
||||||
1. **PHASE 5** - Reduce doc overlap (archive duplicates)
|
|
||||||
2. **P1.5** - Move iOS/App test harness out of published tree (optional)
|
|
||||||
3. **P2.6** - Replace TS `any` with `unknown`/generics
|
|
||||||
4. **P2.7** - Create SYSTEM_INVARIANTS.md
|
|
||||||
5. **P2 Enhancement** - Combined edge case tests (DST + duplicate + cold start)
|
|
||||||
|
|
||||||
## iOS Rollover Implementation Status
|
|
||||||
|
|
||||||
**Status:** ✅ **IMPLEMENTED** (was incorrectly marked as missing)
|
|
||||||
|
|
||||||
**Mechanism:**
|
|
||||||
- iOS uses `NotificationCenter` pattern for decoupled rollover
|
|
||||||
- `AppDelegate.userNotificationCenter(_:willPresent:)` posts `DailyNotificationDelivered` event
|
|
||||||
- Plugin listens via `NotificationCenter.default.addObserver()` in `load()`
|
|
||||||
- `handleNotificationDelivery()` → `processRollover()` → `scheduler.scheduleNextNotification()`
|
|
||||||
- Notifications include `notification_id` and `scheduled_time` in `userInfo` (line 161-165 in `DailyNotificationScheduler.swift`)
|
|
||||||
|
|
||||||
**Why it was marked as missing:**
|
|
||||||
- Parity matrix was outdated
|
|
||||||
- Rollover uses different pattern than Android (NotificationCenter vs direct call)
|
|
||||||
- Implementation exists but wasn't verified in parity doc
|
|
||||||
|
|
||||||
## iOS Recovery Testing Status
|
|
||||||
|
|
||||||
**Status:** ✅ **IMPLEMENTED**
|
|
||||||
|
|
||||||
**Test Coverage:**
|
|
||||||
- `test_recovery_ignores_invalid_records_and_continues()` - Invalid/corrupt records don't crash recovery
|
|
||||||
- `test_recovery_handles_null_fields()` - Null/empty required fields handled gracefully
|
|
||||||
- `test_recovery_dedupes_duplicate_delivery_events()` - Duplicate delivery events result in single rollover
|
|
||||||
- `test_recovery_rollover_idempotent_when_called_twice()` - Rollover is idempotent (can be called multiple times)
|
|
||||||
- `test_recovery_after_cold_start_reconciles_state()` - Cold start recovery reconciles state correctly
|
|
||||||
- `test_recovery_migration_safety_unknown_fields()` - Unknown/missing fields don't crash decode paths
|
|
||||||
|
|
||||||
**Test Infrastructure:**
|
|
||||||
- `TestDBFactory.swift` - Helper for creating test databases and injecting invalid data
|
|
||||||
- Tests use temporary databases for isolation
|
|
||||||
- Tests verify no crashes and graceful error handling
|
|
||||||
|
|
||||||
**Equivalent to Android TEST 4:**
|
|
||||||
- Both platforms now have automated recovery testing
|
|
||||||
- Both test invalid data handling, duplicate prevention, and idempotency
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Package Version:** 1.0.11
|
|
||||||
**Baseline Tag:** `v1.0.11-p0-p1.4-complete` (P0 + P1.4 milestone)
|
|
||||||
|
|
||||||
@@ -1,430 +0,0 @@
|
|||||||
# P2 Design: Parity & Resilience Polish
|
|
||||||
|
|
||||||
**Purpose:** Defines scope, boundaries, and acceptance criteria for P2 work before implementation begins.
|
|
||||||
**Owner:** Development Team
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** design-only (no implementation)
|
|
||||||
**Baseline:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Purpose
|
|
||||||
|
|
||||||
This document defines the **scope, boundaries, and acceptance criteria** for P2 work **before any implementation begins**. It ensures P2:
|
|
||||||
|
|
||||||
- Does not violate established invariants
|
|
||||||
- Has clear "done" criteria
|
|
||||||
- Can be executed incrementally
|
|
||||||
- Maintains the stability achieved in P0/P1.4/P1.5
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## P2 Scope Definition
|
|
||||||
|
|
||||||
### What P2 Includes
|
|
||||||
|
|
||||||
**P2.6 — Type Safety Cleanup**
|
|
||||||
- Replace TypeScript `any` with `unknown`/generics where appropriate
|
|
||||||
- Improve type safety without changing runtime behavior
|
|
||||||
- Maintain backward compatibility
|
|
||||||
|
|
||||||
**P2.7 — System Invariants Documentation**
|
|
||||||
- Document all enforced invariants
|
|
||||||
- Explain "why" behind policy-as-code
|
|
||||||
- Create onboarding reference for contributors
|
|
||||||
|
|
||||||
**P2.x — Parity & Resilience Polish**
|
|
||||||
- Schema versioning strategy (iOS explicit versioning)
|
|
||||||
- Combined edge case tests (DST + duplicate delivery + cold start)
|
|
||||||
- Long-tail behavior validation
|
|
||||||
|
|
||||||
### What P2 Excludes
|
|
||||||
|
|
||||||
- **No new features** — P2 is polish, not expansion
|
|
||||||
- **No architectural changes** — Core structure remains unchanged
|
|
||||||
- **No breaking API changes** — Backward compatibility required
|
|
||||||
- **No new platforms** — Focus on existing iOS/Android/Web
|
|
||||||
- **No new dependencies** — Minimize external additions
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Invariants That Must Not Be Violated
|
|
||||||
|
|
||||||
### 1. Packaging Invariants (P0)
|
|
||||||
|
|
||||||
**Enforced by:** `verify.sh` → `check_package()`
|
|
||||||
|
|
||||||
- `npm pack --dry-run` must not contain forbidden files:
|
|
||||||
- `xcuserdata/`, `*.xcuserstate`, `DerivedData/`
|
|
||||||
- `ios/App/`, `.DS_Store`, `*.swp`, `*.swo`, `*.orig`, `*.rej`
|
|
||||||
- `package.json.files` whitelist must remain authoritative
|
|
||||||
- `.npmignore` is secondary (belt-and-suspenders only)
|
|
||||||
|
|
||||||
**P2 Constraint:** Any P2 changes must not introduce new forbidden file patterns or break packaging checks.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2. Core Module Purity (P1.4)
|
|
||||||
|
|
||||||
**Enforced by:** `verify.sh` → `check_core_source()` + `check_core_artifacts()`
|
|
||||||
|
|
||||||
- `src/core/` must not import:
|
|
||||||
- Node builtins (`fs`, `path`, `os`, `child_process`, etc.)
|
|
||||||
- Platform-specific modules (`@capacitor/*`, `react`, `capacitor`)
|
|
||||||
- `package.json.exports['./core']` must exist and point to valid artifacts
|
|
||||||
- Core types must remain platform-agnostic
|
|
||||||
|
|
||||||
**P2 Constraint:** P2.6 type safety work must not introduce platform dependencies into core.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 3. CI Authority (P0)
|
|
||||||
|
|
||||||
**Enforced by:** `ci/README.md` (policy-as-code contract)
|
|
||||||
|
|
||||||
- `./ci/run.sh` is the **only** supported CI entrypoint
|
|
||||||
- All gates (release, merge, automation) must call `./ci/run.sh`
|
|
||||||
- `npm run build` must not be called directly in gates
|
|
||||||
|
|
||||||
**P2 Constraint:** P2 work must not bypass CI or create alternative entrypoints.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4. Export Correctness (P0)
|
|
||||||
|
|
||||||
**Enforced by:** `verify.sh` → `check_build()`
|
|
||||||
|
|
||||||
- `package.json.exports["./web"]` paths must match actual build artifacts
|
|
||||||
- `package.json.exports["./core"]` paths must match actual build artifacts
|
|
||||||
- All exported paths must exist after build
|
|
||||||
|
|
||||||
**P2 Constraint:** P2.6 type changes must not break export paths or artifact generation.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 5. Documentation Structure (P1.5)
|
|
||||||
|
|
||||||
**Enforced by:** `docs/00-INDEX.md` (index-first rule)
|
|
||||||
|
|
||||||
- New docs must be linked from `docs/00-INDEX.md` or placed in `_archive/`/`_reference/`
|
|
||||||
- Progress docs are authoritative (no drift)
|
|
||||||
- Archive structure standardized (`docs/_archive/`)
|
|
||||||
|
|
||||||
**P2 Constraint:** P2.7 SYSTEM_INVARIANTS.md must be added to index and follow drift guard format.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 6. Baseline Tag Integrity
|
|
||||||
|
|
||||||
**Baseline:** `v1.0.11-p0-p1.4-complete`
|
|
||||||
|
|
||||||
- This tag represents a known-good architectural baseline
|
|
||||||
- All invariants enforced in tooling
|
|
||||||
- Documentation structure established
|
|
||||||
|
|
||||||
**P2 Constraint:** P2 work must not invalidate the baseline or require rollback to it.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## P2 Work Items (Detailed)
|
|
||||||
|
|
||||||
### P2.6: Type Safety Cleanup
|
|
||||||
|
|
||||||
**Goal:** Replace `any` with `unknown`/generics where appropriate, improving type safety without changing runtime behavior.
|
|
||||||
|
|
||||||
**Scope:**
|
|
||||||
- Audit all `any` usages in `src/` (excluding test files initially)
|
|
||||||
- Categorize by risk:
|
|
||||||
- **Low risk:** Type guards with `unknown`, generic constraints
|
|
||||||
- **Medium risk:** API boundaries, error handling
|
|
||||||
- **High risk:** Core module types, public interfaces
|
|
||||||
- Prioritize: Core module → Public interfaces → Internal code
|
|
||||||
|
|
||||||
**Constraints:**
|
|
||||||
- Must not break existing TypeScript compilation
|
|
||||||
- Must not change runtime behavior
|
|
||||||
- Must maintain backward compatibility
|
|
||||||
- Must pass all existing tests
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
- [x] Zero `any` in `src/core/` (except where truly necessary, documented)
|
|
||||||
- [x] Public interfaces (`src/definitions.ts`, `src/index.ts`) use `unknown`/generics
|
|
||||||
- [x] All changes pass `npm run build` and `npm test`
|
|
||||||
- [x] No new type errors introduced
|
|
||||||
- [x] Existing tests pass unchanged
|
|
||||||
|
|
||||||
**Exit Criteria:**
|
|
||||||
- [x] Type safety improved measurably (grep `any` count reduced to zero except documented exception)
|
|
||||||
- [x] No runtime behavior changes
|
|
||||||
- [x] All CI checks pass
|
|
||||||
- [x] Documentation updated (changelog, status, test runs)
|
|
||||||
|
|
||||||
**Status:** ✅ Complete (2025-12-22)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### P2.7: System Invariants Documentation
|
|
||||||
|
|
||||||
**Goal:** Create a single authoritative document that names, explains, and references all enforced invariants.
|
|
||||||
|
|
||||||
**Scope:**
|
|
||||||
- Document all invariants listed in "Invariants That Must Not Be Violated" above
|
|
||||||
- For each invariant:
|
|
||||||
- **What:** Clear statement of the invariant
|
|
||||||
- **Why:** Rationale (why it exists, what it prevents)
|
|
||||||
- **How:** How it's enforced (tooling, process, documentation)
|
|
||||||
- **Where:** References to enforcing code/docs
|
|
||||||
- Include onboarding guidance for new contributors
|
|
||||||
|
|
||||||
**Constraints:**
|
|
||||||
- Must reference existing policy-as-code (not duplicate it)
|
|
||||||
- Must be added to `docs/00-INDEX.md` under "Policy & Contracts"
|
|
||||||
- Must follow drift guard format (Purpose, Owner, Last Updated, Status)
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
- [ ] `docs/SYSTEM_INVARIANTS.md` created with all invariants documented
|
|
||||||
- [ ] Each invariant has: What, Why, How, Where
|
|
||||||
- [ ] Document added to `docs/00-INDEX.md`
|
|
||||||
- [ ] Drift guard header present
|
|
||||||
- [ ] References to enforcing code are accurate and up-to-date
|
|
||||||
|
|
||||||
**Exit Criteria:**
|
|
||||||
- Single source of truth for all invariants
|
|
||||||
- New contributors can understand "what not to break"
|
|
||||||
- Document is discoverable via index
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### P2.x: Parity & Resilience Polish
|
|
||||||
|
|
||||||
**Goal:** Address remaining parity gaps and add resilience tests for edge cases.
|
|
||||||
|
|
||||||
#### P2.1: Schema Versioning Strategy
|
|
||||||
|
|
||||||
**Current State:**
|
|
||||||
- Android: Room migrations (explicit versioning)
|
|
||||||
- iOS: CoreData auto-migration (implicit, may need explicit strategy)
|
|
||||||
|
|
||||||
**Scope:**
|
|
||||||
- Define explicit schema versioning strategy for iOS
|
|
||||||
- Document migration contract (what changes require version bumps)
|
|
||||||
- Add version tracking to CoreData model
|
|
||||||
- Ensure Android and iOS versioning strategies are equivalent in practice
|
|
||||||
|
|
||||||
**Constraints:**
|
|
||||||
- Must not break existing data
|
|
||||||
- Must support forward compatibility
|
|
||||||
- Must be testable
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
- [ ] iOS schema versioning strategy documented
|
|
||||||
- [ ] Version tracking implemented in CoreData model
|
|
||||||
- [ ] Migration contract defined (when to bump versions)
|
|
||||||
- [ ] Tests verify version handling
|
|
||||||
- [ ] Parity matrix updated (schema versioning: ✅ Explicit)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
#### P2.2: Combined Edge Case Tests
|
|
||||||
|
|
||||||
**Current State:**
|
|
||||||
- Individual edge cases tested (DST, duplicate delivery, cold start)
|
|
||||||
- Combined scenarios not explicitly tested
|
|
||||||
|
|
||||||
**Scope:**
|
|
||||||
- Create test scenarios that combine multiple edge cases:
|
|
||||||
- DST boundary + duplicate delivery + cold start
|
|
||||||
- Rollover + migration + recovery
|
|
||||||
- Network failure + rollover + cold start
|
|
||||||
- Ensure idempotency and correctness in combined scenarios
|
|
||||||
|
|
||||||
**Constraints:**
|
|
||||||
- Must not duplicate existing test coverage unnecessarily
|
|
||||||
- Must be runnable in CI (or clearly marked as manual)
|
|
||||||
- Must be deterministic
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
- [ ] At least 3 combined edge case test scenarios
|
|
||||||
- [ ] Tests verify idempotency in combined scenarios
|
|
||||||
- [ ] Tests pass in CI or are clearly documented as manual
|
|
||||||
- [ ] Test results logged in `docs/progress/03-TEST-RUNS.md`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
#### P2.3: Long-Tail Behavior Validation
|
|
||||||
|
|
||||||
**Current State:**
|
|
||||||
- Core functionality tested
|
|
||||||
- Edge cases partially tested
|
|
||||||
- Long-tail scenarios (weeks/months of operation) not validated
|
|
||||||
|
|
||||||
**Scope:**
|
|
||||||
- Document long-tail scenarios that should be validated
|
|
||||||
- Create test plans (not necessarily automated) for:
|
|
||||||
- Extended operation (30+ days)
|
|
||||||
- Multiple DST transitions
|
|
||||||
- Multiple schema migrations
|
|
||||||
- High notification volume over time
|
|
||||||
- Establish validation criteria
|
|
||||||
|
|
||||||
**Constraints:**
|
|
||||||
- May be manual/exploratory initially
|
|
||||||
- Must be documented and repeatable
|
|
||||||
- Must not block P2 completion
|
|
||||||
|
|
||||||
**Acceptance Criteria:**
|
|
||||||
- [ ] Long-tail scenarios documented
|
|
||||||
- [ ] Test plans created (automated or manual)
|
|
||||||
- [ ] Validation criteria defined
|
|
||||||
- [ ] Results tracked in progress docs
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## P2 Execution Strategy
|
|
||||||
|
|
||||||
### Phase Ordering
|
|
||||||
|
|
||||||
**Recommended sequence:**
|
|
||||||
|
|
||||||
1. **P2.7 First** — Document invariants before making changes
|
|
||||||
- Establishes "what not to break" baseline
|
|
||||||
- Helps validate P2.6 and P2.x don't violate invariants
|
|
||||||
|
|
||||||
2. **P2.6 Second** — Type safety cleanup
|
|
||||||
- Low risk, high value
|
|
||||||
- Can be done incrementally (file by file)
|
|
||||||
|
|
||||||
3. **P2.x Last** — Parity & resilience polish
|
|
||||||
- Most complex, may reveal issues
|
|
||||||
- Benefits from P2.6 type improvements
|
|
||||||
|
|
||||||
### Incremental Approach
|
|
||||||
|
|
||||||
- Each P2 item can be completed independently
|
|
||||||
- No dependencies between P2.6, P2.7, and P2.x
|
|
||||||
- Each item has its own acceptance criteria
|
|
||||||
- Can pause/resume at any item boundary
|
|
||||||
|
|
||||||
### Testing Strategy
|
|
||||||
|
|
||||||
- **P2.6:** Existing tests must pass unchanged
|
|
||||||
- **P2.7:** Documentation review (no code changes)
|
|
||||||
- **P2.x:** New tests required, existing tests must pass
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## P2 "Done" Criteria
|
|
||||||
|
|
||||||
### Overall P2 Completion
|
|
||||||
|
|
||||||
P2 is complete when:
|
|
||||||
|
|
||||||
1. **All P2 items completed** (P2.6, P2.7, P2.x)
|
|
||||||
2. **All invariants preserved** (verified by CI)
|
|
||||||
3. **All acceptance criteria met** (per item)
|
|
||||||
4. **Documentation updated** (progress docs, index, changelog)
|
|
||||||
5. **Baseline tag created** (if desired: `v1.0.11-p2-complete`)
|
|
||||||
|
|
||||||
### Individual Item Completion
|
|
||||||
|
|
||||||
Each P2 item is complete when:
|
|
||||||
|
|
||||||
- [ ] Acceptance criteria met
|
|
||||||
- [ ] CI passes (`./ci/run.sh`)
|
|
||||||
- [ ] No invariant violations
|
|
||||||
- [ ] Documentation updated (if applicable)
|
|
||||||
- [ ] Progress docs updated
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Risk Mitigation
|
|
||||||
|
|
||||||
### Risk: Breaking Existing Functionality
|
|
||||||
|
|
||||||
**Mitigation:**
|
|
||||||
- All changes must pass existing tests
|
|
||||||
- Incremental approach (one file/feature at a time)
|
|
||||||
- CI gates prevent regressions
|
|
||||||
|
|
||||||
### Risk: Violating Invariants
|
|
||||||
|
|
||||||
**Mitigation:**
|
|
||||||
- P2.7 documents invariants first
|
|
||||||
- CI enforces invariants automatically
|
|
||||||
- Design review before implementation
|
|
||||||
|
|
||||||
### Risk: Scope Creep
|
|
||||||
|
|
||||||
**Mitigation:**
|
|
||||||
- Clear "what P2 excludes" section
|
|
||||||
- Acceptance criteria defined upfront
|
|
||||||
- Can pause/resume at item boundaries
|
|
||||||
|
|
||||||
### Risk: Documentation Drift
|
|
||||||
|
|
||||||
**Mitigation:**
|
|
||||||
- P2.7 creates invariant documentation
|
|
||||||
- Progress docs updated per item
|
|
||||||
- Index updated per P1.5 rules
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Success Metrics
|
|
||||||
|
|
||||||
### Quantitative
|
|
||||||
|
|
||||||
- **P2.6:** `any` usage count reduced (target: 50%+ reduction in `src/core/` and public interfaces)
|
|
||||||
- **P2.7:** All invariants documented (target: 100% coverage)
|
|
||||||
- **P2.x:** Combined edge case tests added (target: 3+ scenarios)
|
|
||||||
|
|
||||||
### Qualitative
|
|
||||||
|
|
||||||
- **Type safety:** Code is more maintainable, fewer runtime type errors possible
|
|
||||||
- **Documentation:** New contributors understand invariants quickly
|
|
||||||
- **Resilience:** Edge cases are better understood and tested
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Dependencies
|
|
||||||
|
|
||||||
### External Dependencies
|
|
||||||
|
|
||||||
- None — P2 is self-contained polish work
|
|
||||||
|
|
||||||
### Internal Dependencies
|
|
||||||
|
|
||||||
- **P2.7 → P2.6/P2.x:** Invariant documentation helps validate other work
|
|
||||||
- **P2.6 → P2.x:** Type improvements may help P2.x implementation
|
|
||||||
|
|
||||||
### Blocking Dependencies
|
|
||||||
|
|
||||||
- None — P2 can start immediately after P1.5
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Timeline Estimate
|
|
||||||
|
|
||||||
**P2.7:** 2-4 hours (documentation only)
|
|
||||||
**P2.6:** 8-16 hours (incremental type cleanup)
|
|
||||||
**P2.x:** 16-32 hours (varies by item complexity)
|
|
||||||
|
|
||||||
**Total:** 26-52 hours (can be spread over multiple sessions)
|
|
||||||
|
|
||||||
**Note:** These are estimates. Actual time depends on codebase complexity and test coverage.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Next Steps (After Design Approval)
|
|
||||||
|
|
||||||
1. **Review this design** — Ensure scope and constraints are correct
|
|
||||||
2. **Approve invariants list** — Confirm nothing is missing
|
|
||||||
3. **Prioritize P2 items** — Decide execution order
|
|
||||||
4. **Begin P2.7** — Document invariants first (recommended)
|
|
||||||
5. **Execute incrementally** — One item at a time, pause/resume as needed
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Last Updated:** 2025-12-22
|
|
||||||
**Status:** Design-Only (No Implementation)
|
|
||||||
**Next Action:** Review and approve design before proceeding
|
|
||||||
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
# DailyNotification Testing Quick Reference
|
# DailyNotification Testing Quick Reference
|
||||||
|
|
||||||
> **Note:** For P0 production-grade features testing, see [QUICK_REFERENCE_V2.md](./QUICK_REFERENCE_V2.md)
|
|
||||||
|
|
||||||
## 🚀 Quick Start
|
## 🚀 Quick Start
|
||||||
|
|
||||||
### Manual Testing
|
### Manual Testing
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
# Testing Quick Reference - P0 Production-Grade Features
|
# Testing Quick Reference - P0 Production-Grade Features
|
||||||
|
|
||||||
> **Note:** For general testing commands, see [QUICK_REFERENCE.md](./QUICK_REFERENCE.md)
|
|
||||||
|
|
||||||
## Current Version Features
|
## Current Version Features
|
||||||
|
|
||||||
✅ **P0 Priority 1**: Channel Management (ChannelManager)
|
✅ **P0 Priority 1**: Channel Management (ChannelManager)
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Pre-push Git Hook
|
|
||||||
#
|
|
||||||
# Runs local CI before allowing push to remote.
|
|
||||||
# This ensures code quality and packaging safety before sharing changes.
|
|
||||||
#
|
|
||||||
# Setup:
|
|
||||||
# git config core.hooksPath githooks
|
|
||||||
#
|
|
||||||
# To skip (not recommended):
|
|
||||||
# git push --no-verify
|
|
||||||
#
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# Get project root
|
|
||||||
PROJECT_ROOT="$(git rev-parse --show-toplevel)"
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo "Pre-push: Running local CI..."
|
|
||||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Run local CI
|
|
||||||
if ./ci/run.sh; then
|
|
||||||
echo ""
|
|
||||||
echo "✅ Pre-push check passed - proceeding with push"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
echo "❌ Pre-push check failed - push blocked"
|
|
||||||
echo ""
|
|
||||||
echo "To skip this check (not recommended): git push --no-verify"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -1,376 +0,0 @@
|
|||||||
//
|
|
||||||
// DailyNotificationRecoveryTests.swift
|
|
||||||
// DailyNotificationPluginTests
|
|
||||||
//
|
|
||||||
// Created by Matthew Raymer on 2025-12-16
|
|
||||||
// Copyright © 2025 TimeSafari. All rights reserved.
|
|
||||||
//
|
|
||||||
|
|
||||||
import XCTest
|
|
||||||
import UserNotifications
|
|
||||||
@testable import DailyNotificationPlugin
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recovery tests for invalid data handling and rollover idempotency
|
|
||||||
*
|
|
||||||
* Tests recovery scenarios equivalent to Android TEST 4:
|
|
||||||
* - Invalid/corrupt records don't crash recovery
|
|
||||||
* - Duplicate delivery events are deduped
|
|
||||||
* - Rollover is idempotent (can be called multiple times safely)
|
|
||||||
* - Cold-start recovery reconciles state correctly
|
|
||||||
* - Migration safety (unknown fields don't crash)
|
|
||||||
*/
|
|
||||||
class DailyNotificationRecoveryTests: XCTestCase {
|
|
||||||
|
|
||||||
var database: DailyNotificationDatabase!
|
|
||||||
var storage: DailyNotificationStorage!
|
|
||||||
var scheduler: DailyNotificationScheduler!
|
|
||||||
var reactivationManager: DailyNotificationReactivationManager!
|
|
||||||
var notificationCenter: UNUserNotificationCenter!
|
|
||||||
var testDbPath: String!
|
|
||||||
|
|
||||||
override func setUp() {
|
|
||||||
super.setUp()
|
|
||||||
|
|
||||||
// Create clean test database
|
|
||||||
let (db, path) = TestDBFactory.createCleanDatabase()
|
|
||||||
database = db
|
|
||||||
testDbPath = path
|
|
||||||
storage = DailyNotificationStorage(databasePath: path)
|
|
||||||
scheduler = DailyNotificationScheduler()
|
|
||||||
notificationCenter = UNUserNotificationCenter.current()
|
|
||||||
|
|
||||||
reactivationManager = DailyNotificationReactivationManager(
|
|
||||||
database: database,
|
|
||||||
storage: storage,
|
|
||||||
scheduler: scheduler
|
|
||||||
)
|
|
||||||
|
|
||||||
// Clear UserDefaults
|
|
||||||
UserDefaults.standard.removeObject(forKey: "DNP_LAST_LAUNCH_TIME")
|
|
||||||
|
|
||||||
// Clear pending notifications
|
|
||||||
let expectation = XCTestExpectation(description: "Clear notifications")
|
|
||||||
notificationCenter.removeAllPendingNotificationRequests { _ in
|
|
||||||
expectation.fulfill()
|
|
||||||
}
|
|
||||||
wait(for: [expectation], timeout: 2.0)
|
|
||||||
}
|
|
||||||
|
|
||||||
override func tearDown() {
|
|
||||||
reactivationManager = nil
|
|
||||||
scheduler = nil
|
|
||||||
storage = nil
|
|
||||||
database = nil
|
|
||||||
notificationCenter = nil
|
|
||||||
|
|
||||||
// Clean up test database
|
|
||||||
if let path = testDbPath {
|
|
||||||
TestDBFactory.cleanupDatabase(path: path)
|
|
||||||
}
|
|
||||||
|
|
||||||
UserDefaults.standard.removeObject(forKey: "DNP_LAST_LAUNCH_TIME")
|
|
||||||
|
|
||||||
super.tearDown()
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Invalid Records Tests
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test that recovery ignores invalid records and continues
|
|
||||||
*
|
|
||||||
* Equivalent to Android TEST 4: Invalid Data Handling
|
|
||||||
*/
|
|
||||||
func test_recovery_ignores_invalid_records_and_continues() async throws {
|
|
||||||
// Given: Database with invalid records
|
|
||||||
TestDBFactory.injectInvalidNotificationRecord(
|
|
||||||
database: database,
|
|
||||||
id: "", // Empty ID
|
|
||||||
scheduledTime: -1, // Invalid time
|
|
||||||
payloadJSON: "invalid json {" // Invalid JSON
|
|
||||||
)
|
|
||||||
|
|
||||||
TestDBFactory.injectInvalidNotificationRecord(
|
|
||||||
database: database,
|
|
||||||
id: "test_null_time",
|
|
||||||
scheduledTime: 0, // Zero time
|
|
||||||
payloadJSON: "{\"title\":\"Test\"}" // Valid JSON but missing fields
|
|
||||||
)
|
|
||||||
|
|
||||||
// Also inject a valid record to ensure recovery continues
|
|
||||||
let validNotification = NotificationContent(
|
|
||||||
id: UUID().uuidString,
|
|
||||||
title: "Valid Notification",
|
|
||||||
body: "Valid Body",
|
|
||||||
scheduledTime: Int64(Date().addingTimeInterval(3600).timeIntervalSince1970 * 1000),
|
|
||||||
fetchedAt: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
url: nil,
|
|
||||||
payload: nil,
|
|
||||||
etag: nil
|
|
||||||
)
|
|
||||||
storage.saveNotificationContent(validNotification)
|
|
||||||
|
|
||||||
// When: Perform recovery
|
|
||||||
let expectation = XCTestExpectation(description: "Recovery with invalid records")
|
|
||||||
reactivationManager.performRecovery()
|
|
||||||
|
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) {
|
|
||||||
expectation.fulfill()
|
|
||||||
}
|
|
||||||
await fulfillment(of: [expectation], timeout: 5.0)
|
|
||||||
|
|
||||||
// Then: App should not crash, recovery should complete
|
|
||||||
XCTAssertTrue(true, "Recovery should complete without crashing on invalid records")
|
|
||||||
|
|
||||||
// Verify valid notification can still be retrieved
|
|
||||||
let retrieved = storage.getNotificationContent(id: validNotification.id)
|
|
||||||
XCTAssertNotNil(retrieved, "Valid notification should still be retrievable")
|
|
||||||
XCTAssertEqual(retrieved?.id, validNotification.id, "Valid notification ID should match")
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test recovery with null/empty required fields
|
|
||||||
*/
|
|
||||||
func test_recovery_handles_null_fields() async throws {
|
|
||||||
// Given: Database with null fields
|
|
||||||
TestDBFactory.injectNotificationWithNullFields(database: database)
|
|
||||||
|
|
||||||
// When: Perform recovery
|
|
||||||
let expectation = XCTestExpectation(description: "Recovery with null fields")
|
|
||||||
reactivationManager.performRecovery()
|
|
||||||
|
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
|
|
||||||
expectation.fulfill()
|
|
||||||
}
|
|
||||||
await fulfillment(of: [expectation], timeout: 3.0)
|
|
||||||
|
|
||||||
// Then: App should not crash
|
|
||||||
XCTAssertTrue(true, "Recovery should handle null fields gracefully")
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Duplicate Delivery Tests
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test that duplicate delivery events are deduped
|
|
||||||
*
|
|
||||||
* Simulates two delivery events arriving close together
|
|
||||||
* Tests the rollover idempotency mechanism
|
|
||||||
*/
|
|
||||||
func test_recovery_dedupes_duplicate_delivery_events() async throws {
|
|
||||||
// Given: A notification that was just delivered
|
|
||||||
let notificationId = UUID().uuidString
|
|
||||||
let pastTime = Int64(Date().addingTimeInterval(-3600).timeIntervalSince1970 * 1000) // 1 hour ago
|
|
||||||
let notification = NotificationContent(
|
|
||||||
id: notificationId,
|
|
||||||
title: "Test Notification",
|
|
||||||
body: "Test Body",
|
|
||||||
scheduledTime: pastTime,
|
|
||||||
fetchedAt: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
url: nil,
|
|
||||||
payload: nil,
|
|
||||||
etag: nil
|
|
||||||
)
|
|
||||||
storage.saveNotificationContent(notification)
|
|
||||||
|
|
||||||
// When: Simulate duplicate delivery events by calling rollover directly twice
|
|
||||||
// (Testing the rollover logic directly, which is what handles duplicate deliveries)
|
|
||||||
let firstRollover = await scheduler.scheduleNextNotification(
|
|
||||||
notification,
|
|
||||||
storage: storage,
|
|
||||||
fetcher: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
// Wait a very short time (simulating rapid duplicate delivery)
|
|
||||||
try await Task.sleep(nanoseconds: 50_000_000) // 0.05 seconds
|
|
||||||
|
|
||||||
// Call rollover again immediately (simulating duplicate delivery)
|
|
||||||
let secondRollover = await scheduler.scheduleNextNotification(
|
|
||||||
notification,
|
|
||||||
storage: storage,
|
|
||||||
fetcher: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
// Then: Check that rollover is idempotent (second call should be skipped)
|
|
||||||
// The rollover state tracking should prevent duplicate scheduling
|
|
||||||
XCTAssertTrue(true, "Rollover should handle duplicate calls idempotently")
|
|
||||||
|
|
||||||
// Verify only one next notification was scheduled
|
|
||||||
let pendingNotifications = try await notificationCenter.pendingNotificationRequests()
|
|
||||||
let nextDayTime = pastTime + (24 * 60 * 60 * 1000) // 24 hours later
|
|
||||||
let rolloverCount = pendingNotifications.filter { request in
|
|
||||||
if let trigger = request.trigger as? UNCalendarNotificationTrigger,
|
|
||||||
let nextDate = trigger.nextTriggerDate() {
|
|
||||||
let pendingTime = Int64(nextDate.timeIntervalSince1970 * 1000)
|
|
||||||
// Allow 1 minute tolerance for DST
|
|
||||||
return abs(pendingTime - nextDayTime) < (60 * 1000)
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}.count
|
|
||||||
|
|
||||||
// Should have at most 1 rollover notification (idempotency check)
|
|
||||||
XCTAssertLessThanOrEqual(rolloverCount, 1,
|
|
||||||
"Duplicate rollover calls should result in at most one next notification")
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Rollover Idempotency Tests
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test that rollover is idempotent when called multiple times
|
|
||||||
*
|
|
||||||
* Equivalent to Android TEST 0: Daily Rollover Verification
|
|
||||||
*/
|
|
||||||
func test_recovery_rollover_idempotent_when_called_twice() async throws {
|
|
||||||
// Given: A notification that was just delivered
|
|
||||||
let notificationId = UUID().uuidString
|
|
||||||
let pastTime = Int64(Date().addingTimeInterval(-3600).timeIntervalSince1970 * 1000) // 1 hour ago
|
|
||||||
let notification = NotificationContent(
|
|
||||||
id: notificationId,
|
|
||||||
title: "Delivered Notification",
|
|
||||||
body: "This was delivered",
|
|
||||||
scheduledTime: pastTime,
|
|
||||||
fetchedAt: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
url: nil,
|
|
||||||
payload: nil,
|
|
||||||
etag: nil
|
|
||||||
)
|
|
||||||
storage.saveNotificationContent(notification)
|
|
||||||
|
|
||||||
// When: Call scheduleNextNotification twice (simulating duplicate rollover attempts)
|
|
||||||
let firstCall = await scheduler.scheduleNextNotification(
|
|
||||||
notification,
|
|
||||||
storage: storage,
|
|
||||||
fetcher: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
// Wait a bit
|
|
||||||
try await Task.sleep(nanoseconds: 100_000_000) // 0.1 seconds
|
|
||||||
|
|
||||||
// Call again immediately (should be idempotent)
|
|
||||||
let secondCall = await scheduler.scheduleNextNotification(
|
|
||||||
notification,
|
|
||||||
storage: storage,
|
|
||||||
fetcher: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
// Then: Second call should be skipped (idempotency)
|
|
||||||
// First call may succeed, second should be skipped due to rollover state tracking
|
|
||||||
XCTAssertTrue(true, "Rollover should be idempotent - second call should be skipped")
|
|
||||||
|
|
||||||
// Verify only one next notification was scheduled
|
|
||||||
let pendingNotifications = try await notificationCenter.pendingNotificationRequests()
|
|
||||||
let nextDayTime = pastTime + (24 * 60 * 60 * 1000) // 24 hours later
|
|
||||||
let rolloverCount = pendingNotifications.filter { request in
|
|
||||||
if let trigger = request.trigger as? UNCalendarNotificationTrigger,
|
|
||||||
let nextDate = trigger.nextTriggerDate() {
|
|
||||||
let pendingTime = Int64(nextDate.timeIntervalSince1970 * 1000)
|
|
||||||
return abs(pendingTime - nextDayTime) < (60 * 1000) // 1 minute tolerance
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}.count
|
|
||||||
|
|
||||||
XCTAssertLessThanOrEqual(rolloverCount, 1,
|
|
||||||
"Rollover should be idempotent - only one next notification should be scheduled")
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Cold Start Recovery Tests
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test recovery after cold start reconciles state correctly
|
|
||||||
*/
|
|
||||||
func test_recovery_after_cold_start_reconciles_state() async throws {
|
|
||||||
// Given: Notifications in storage but not in system (simulating cold start)
|
|
||||||
let notification1 = NotificationContent(
|
|
||||||
id: UUID().uuidString,
|
|
||||||
title: "Notification 1",
|
|
||||||
body: "Body 1",
|
|
||||||
scheduledTime: Int64(Date().addingTimeInterval(3600).timeIntervalSince1970 * 1000),
|
|
||||||
fetchedAt: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
url: nil,
|
|
||||||
payload: nil,
|
|
||||||
etag: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
let notification2 = NotificationContent(
|
|
||||||
id: UUID().uuidString,
|
|
||||||
title: "Notification 2",
|
|
||||||
body: "Body 2",
|
|
||||||
scheduledTime: Int64(Date().addingTimeInterval(7200).timeIntervalSince1970 * 1000),
|
|
||||||
fetchedAt: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
url: nil,
|
|
||||||
payload: nil,
|
|
||||||
etag: nil
|
|
||||||
)
|
|
||||||
|
|
||||||
storage.saveNotificationContent(notification1)
|
|
||||||
storage.saveNotificationContent(notification2)
|
|
||||||
|
|
||||||
// Verify notifications are NOT in system (cold start scenario)
|
|
||||||
let pendingBefore = try await notificationCenter.pendingNotificationRequests()
|
|
||||||
let foundBefore = pendingBefore.contains { $0.identifier == notification1.id || $0.identifier == notification2.id }
|
|
||||||
XCTAssertFalse(foundBefore, "Notifications should not be in system before recovery")
|
|
||||||
|
|
||||||
// When: Perform recovery (simulating app launch after cold start)
|
|
||||||
let expectation = XCTestExpectation(description: "Cold start recovery")
|
|
||||||
reactivationManager.performRecovery()
|
|
||||||
|
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) {
|
|
||||||
expectation.fulfill()
|
|
||||||
}
|
|
||||||
await fulfillment(of: [expectation], timeout: 5.0)
|
|
||||||
|
|
||||||
// Then: Notifications should be rescheduled (recovery should reconcile)
|
|
||||||
let pendingAfter = try await notificationCenter.pendingNotificationRequests()
|
|
||||||
|
|
||||||
// Recovery may or may not succeed depending on permissions, but app shouldn't crash
|
|
||||||
XCTAssertNoThrow(pendingAfter, "Recovery should complete without crashing")
|
|
||||||
|
|
||||||
// If recovery succeeded, notifications should be rescheduled
|
|
||||||
let foundAfter = pendingAfter.contains { $0.identifier == notification1.id || $0.identifier == notification2.id }
|
|
||||||
// Note: Recovery may fail due to permissions, but we verify it doesn't crash
|
|
||||||
XCTAssertTrue(true, "Recovery should attempt to reschedule notifications")
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: - Migration Safety Tests
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test that unknown/missing fields don't crash decode/load paths
|
|
||||||
*
|
|
||||||
* Minimum viable migration safety test
|
|
||||||
*/
|
|
||||||
func test_recovery_migration_safety_unknown_fields() async throws {
|
|
||||||
// Given: Database with records that have unknown/missing fields
|
|
||||||
// We simulate this by injecting records with minimal data
|
|
||||||
TestDBFactory.injectInvalidNotificationRecord(
|
|
||||||
database: database,
|
|
||||||
id: "migration_test_1",
|
|
||||||
scheduledTime: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
payloadJSON: "{\"title\":\"Test\"}" // Missing 'body' field
|
|
||||||
)
|
|
||||||
|
|
||||||
TestDBFactory.injectInvalidNotificationRecord(
|
|
||||||
database: database,
|
|
||||||
id: "migration_test_2",
|
|
||||||
scheduledTime: Int64(Date().timeIntervalSince1970 * 1000),
|
|
||||||
payloadJSON: "{}" // Empty payload
|
|
||||||
)
|
|
||||||
|
|
||||||
// When: Try to retrieve notifications (simulating migration/load)
|
|
||||||
// Storage should handle missing fields gracefully
|
|
||||||
let allNotifications = storage.getAllNotifications()
|
|
||||||
|
|
||||||
// Then: App should not crash, should handle missing fields
|
|
||||||
XCTAssertNoThrow(allNotifications, "Storage should handle missing fields without crashing")
|
|
||||||
|
|
||||||
// Recovery should also handle these gracefully
|
|
||||||
let expectation = XCTestExpectation(description: "Migration safety recovery")
|
|
||||||
reactivationManager.performRecovery()
|
|
||||||
|
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
|
|
||||||
expectation.fulfill()
|
|
||||||
}
|
|
||||||
await fulfillment(of: [expectation], timeout: 3.0)
|
|
||||||
|
|
||||||
XCTAssertTrue(true, "Recovery should handle unknown/missing fields gracefully")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
//
|
|
||||||
// TestDBFactory.swift
|
|
||||||
// DailyNotificationPluginTests
|
|
||||||
//
|
|
||||||
// Created by Matthew Raymer on 2025-12-16
|
|
||||||
// Copyright © 2025 TimeSafari. All rights reserved.
|
|
||||||
//
|
|
||||||
|
|
||||||
import Foundation
|
|
||||||
import SQLite3
|
|
||||||
@testable import DailyNotificationPlugin
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test database factory for recovery testing
|
|
||||||
*
|
|
||||||
* Provides utilities to create test databases with intentionally invalid/corrupt data
|
|
||||||
* for testing recovery scenarios.
|
|
||||||
*/
|
|
||||||
class TestDBFactory {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a clean test database
|
|
||||||
*
|
|
||||||
* @return Tuple of (database, path)
|
|
||||||
*/
|
|
||||||
static func createCleanDatabase() -> (DailyNotificationDatabase, String) {
|
|
||||||
let testDbPath = NSTemporaryDirectory().appending("test_recovery_db_\(UUID().uuidString).sqlite")
|
|
||||||
let database = DailyNotificationDatabase(path: testDbPath)
|
|
||||||
return (database, testDbPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inject invalid notification record directly into database
|
|
||||||
*
|
|
||||||
* @param database Database instance
|
|
||||||
* @param id Notification ID (can be empty for invalid test)
|
|
||||||
* @param scheduledTime Scheduled time (can be invalid/negative)
|
|
||||||
* @param payloadJSON Payload (can be invalid JSON)
|
|
||||||
*/
|
|
||||||
static func injectInvalidNotificationRecord(
|
|
||||||
database: DailyNotificationDatabase,
|
|
||||||
id: String = "",
|
|
||||||
scheduledTime: Int64 = -1,
|
|
||||||
payloadJSON: String = "invalid json {"
|
|
||||||
) {
|
|
||||||
// Direct SQL injection for testing (using executeSQL which is public)
|
|
||||||
let escapedId = id.replacingOccurrences(of: "'", with: "''")
|
|
||||||
let escapedPayload = payloadJSON.replacingOccurrences(of: "'", with: "''")
|
|
||||||
let sql = """
|
|
||||||
INSERT INTO \(DailyNotificationDatabase.TABLE_NOTIF_CONTENTS) (
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_SLOT_ID),
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_PAYLOAD_JSON),
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_FETCHED_AT),
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_ETAG)
|
|
||||||
) VALUES ('\(escapedId)', '\(escapedPayload)', \(scheduledTime), NULL);
|
|
||||||
"""
|
|
||||||
database.executeSQL(sql)
|
|
||||||
print("TestDBFactory: Injected invalid notification record: id=\(id), time=\(scheduledTime)")
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inject notification with null/empty required fields
|
|
||||||
*/
|
|
||||||
static func injectNotificationWithNullFields(database: DailyNotificationDatabase) {
|
|
||||||
let sql = """
|
|
||||||
INSERT INTO \(DailyNotificationDatabase.TABLE_NOTIF_CONTENTS) (
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_SLOT_ID),
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_PAYLOAD_JSON),
|
|
||||||
\(DailyNotificationDatabase.COL_CONTENTS_FETCHED_AT)
|
|
||||||
) VALUES (NULL, '', 0);
|
|
||||||
"""
|
|
||||||
database.executeSQL(sql)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inject duplicate notification records (same ID, different times)
|
|
||||||
*/
|
|
||||||
static func injectDuplicateNotifications(
|
|
||||||
database: DailyNotificationDatabase,
|
|
||||||
id: String,
|
|
||||||
times: [Int64]
|
|
||||||
) {
|
|
||||||
for time in times {
|
|
||||||
injectInvalidNotificationRecord(
|
|
||||||
database: database,
|
|
||||||
id: id,
|
|
||||||
scheduledTime: time,
|
|
||||||
payloadJSON: "{\"title\":\"Test\",\"body\":\"Body\"}"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reset database (drop and recreate tables)
|
|
||||||
*/
|
|
||||||
static func resetDatabase(database: DailyNotificationDatabase) {
|
|
||||||
database.executeSQL("DROP TABLE IF EXISTS \(DailyNotificationDatabase.TABLE_NOTIF_CONTENTS);")
|
|
||||||
database.executeSQL("DROP TABLE IF EXISTS \(DailyNotificationDatabase.TABLE_NOTIF_DELIVERIES);")
|
|
||||||
database.executeSQL("DROP TABLE IF EXISTS \(DailyNotificationDatabase.TABLE_NOTIF_CONFIG);")
|
|
||||||
// Recreate tables by opening a new connection
|
|
||||||
let _ = DailyNotificationDatabase(path: database.getPath())
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clean up test database file
|
|
||||||
*/
|
|
||||||
static func cleanupDatabase(path: String) {
|
|
||||||
let fileManager = FileManager.default
|
|
||||||
if fileManager.fileExists(atPath: path) {
|
|
||||||
try? fileManager.removeItem(atPath: path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
27
package.json
27
package.json
@@ -20,8 +20,8 @@
|
|||||||
"lint": "eslint . --ext .ts",
|
"lint": "eslint . --ext .ts",
|
||||||
"lint-fix": "eslint . --ext .ts --fix",
|
"lint-fix": "eslint . --ext .ts --fix",
|
||||||
"format": "prettier --write \"src/**/*.ts\"",
|
"format": "prettier --write \"src/**/*.ts\"",
|
||||||
"markdown:check": "markdownlint-cli2 \"docs/**/*.md\" \"*.md\"",
|
"markdown:check": "markdownlint-cli2 \"doc/*.md\" \"*.md\"",
|
||||||
"markdown:fix": "markdownlint-cli2 --fix \"docs/**/*.md\" \"*.md\"",
|
"markdown:fix": "markdownlint-cli2 --fix \"doc/*.md\" \"*.md\"",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
"size:check": "node scripts/check-bundle-size.js",
|
"size:check": "node scripts/check-bundle-size.js",
|
||||||
"api:check": "node scripts/check-api-changes.js",
|
"api:check": "node scripts/check-api-changes.js",
|
||||||
@@ -60,13 +60,9 @@
|
|||||||
"require": "./dist/plugin.js"
|
"require": "./dist/plugin.js"
|
||||||
},
|
},
|
||||||
"./web": {
|
"./web": {
|
||||||
"types": "./dist/esm/web.d.ts",
|
"types": "./dist/esm/web/index.d.ts",
|
||||||
"import": "./dist/esm/web.js",
|
"import": "./dist/esm/web/index.js",
|
||||||
"require": "./dist/esm/web.js"
|
"require": "./dist/web/index.js"
|
||||||
},
|
|
||||||
"./core": {
|
|
||||||
"types": "./dist/esm/core/index.d.ts",
|
|
||||||
"import": "./dist/esm/core/index.js"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sideEffects": false,
|
"sideEffects": false,
|
||||||
@@ -98,18 +94,9 @@
|
|||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist/",
|
"dist/",
|
||||||
|
"ios/",
|
||||||
"android/",
|
"android/",
|
||||||
"ios/Plugin/",
|
"DailyNotificationPlugin.podspec"
|
||||||
"ios/Tests/",
|
|
||||||
"ios/*.podspec",
|
|
||||||
"ios/*.xcodeproj/",
|
|
||||||
"ios/*.xcworkspace/",
|
|
||||||
"ios/project.yml",
|
|
||||||
"ios/Podfile",
|
|
||||||
"ios/Podfile.lock",
|
|
||||||
"CapacitorDailyNotification.podspec",
|
|
||||||
"README.md",
|
|
||||||
"LICENSE"
|
|
||||||
],
|
],
|
||||||
"capacitor": {
|
"capacitor": {
|
||||||
"ios": {
|
"ios": {
|
||||||
|
|||||||
@@ -1,569 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
#
|
|
||||||
# Daily Notification Plugin - Verification Script
|
|
||||||
#
|
|
||||||
# Single entrypoint to validate the project state.
|
|
||||||
# Used by CI and local development.
|
|
||||||
#
|
|
||||||
# @author Matthew Raymer
|
|
||||||
# @version 1.0.0
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# Colors for output
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;32m'
|
|
||||||
YELLOW='\033[1;33m'
|
|
||||||
BLUE='\033[0;34m'
|
|
||||||
NC='\033[0m' # No Color
|
|
||||||
|
|
||||||
# Script directory
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
|
|
||||||
|
|
||||||
# Counters
|
|
||||||
PASSED=0
|
|
||||||
FAILED=0
|
|
||||||
SKIPPED=0
|
|
||||||
|
|
||||||
# Logging functions
|
|
||||||
print_header() {
|
|
||||||
echo -e "\n${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
|
|
||||||
echo -e "${BLUE}$1${NC}"
|
|
||||||
echo -e "${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}\n"
|
|
||||||
}
|
|
||||||
|
|
||||||
print_info() {
|
|
||||||
echo -e "${BLUE}ℹ${NC} $1"
|
|
||||||
}
|
|
||||||
|
|
||||||
print_success() {
|
|
||||||
echo -e "${GREEN}✓${NC} $1"
|
|
||||||
((PASSED++))
|
|
||||||
}
|
|
||||||
|
|
||||||
print_error() {
|
|
||||||
echo -e "${RED}✗${NC} $1"
|
|
||||||
((FAILED++))
|
|
||||||
}
|
|
||||||
|
|
||||||
print_warning() {
|
|
||||||
echo -e "${YELLOW}⚠${NC} $1"
|
|
||||||
((SKIPPED++))
|
|
||||||
}
|
|
||||||
|
|
||||||
# Check if command exists
|
|
||||||
command_exists() {
|
|
||||||
command -v "$1" >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Run command and capture result
|
|
||||||
run_check() {
|
|
||||||
local name="$1"
|
|
||||||
shift
|
|
||||||
print_info "Checking: $name"
|
|
||||||
|
|
||||||
# Capture output for debugging on failure
|
|
||||||
local output
|
|
||||||
output=$("$@" 2>&1)
|
|
||||||
local exit_code=$?
|
|
||||||
|
|
||||||
if [ $exit_code -eq 0 ]; then
|
|
||||||
print_success "$name"
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
print_error "$name"
|
|
||||||
# Print captured output on failure for debugging
|
|
||||||
echo ""
|
|
||||||
echo "Command output:"
|
|
||||||
echo "$output" | head -20
|
|
||||||
if [ $(echo "$output" | wc -l) -gt 20 ]; then
|
|
||||||
echo "... (truncated, showing first 20 lines)"
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Print environment diagnostics
|
|
||||||
print_environment() {
|
|
||||||
print_header "Environment Diagnostics"
|
|
||||||
|
|
||||||
echo "Project Root: $PROJECT_ROOT"
|
|
||||||
echo "Script Directory: $SCRIPT_DIR"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Node.js
|
|
||||||
if command_exists node; then
|
|
||||||
echo "Node.js: $(node --version)"
|
|
||||||
else
|
|
||||||
echo "Node.js: ❌ Not found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# npm
|
|
||||||
if command_exists npm; then
|
|
||||||
echo "npm: $(npm --version)"
|
|
||||||
else
|
|
||||||
echo "npm: ❌ Not found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Java (for Android)
|
|
||||||
if command_exists java; then
|
|
||||||
echo "Java: $(java -version 2>&1 | head -n 1)"
|
|
||||||
else
|
|
||||||
echo "Java: ⚠ Not found (Android builds may fail)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Gradle (for Android)
|
|
||||||
if command_exists gradle; then
|
|
||||||
echo "Gradle: $(gradle --version 2>&1 | grep 'Gradle' | head -n 1 || echo 'Unknown')"
|
|
||||||
else
|
|
||||||
echo "Gradle: ⚠ Not found (using wrapper)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Swift (for iOS)
|
|
||||||
if command_exists swift; then
|
|
||||||
echo "Swift: $(swift --version 2>&1 | head -n 1)"
|
|
||||||
else
|
|
||||||
echo "Swift: ⚠ Not found (iOS builds may fail)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# xcodebuild (for iOS)
|
|
||||||
if command_exists xcodebuild; then
|
|
||||||
echo "xcodebuild: $(xcodebuild -version 2>&1 | head -n 1)"
|
|
||||||
else
|
|
||||||
echo "xcodebuild: ⚠ Not found (iOS builds may fail)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Install dependencies (best effort)
|
|
||||||
install_dependencies() {
|
|
||||||
print_header "Installing Dependencies"
|
|
||||||
|
|
||||||
if [ ! -d "$PROJECT_ROOT/node_modules" ]; then
|
|
||||||
print_info "Installing npm dependencies..."
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
npm install || print_warning "npm install failed (non-blocking)"
|
|
||||||
else
|
|
||||||
print_success "Dependencies already installed"
|
|
||||||
fi
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# TypeScript checks
|
|
||||||
check_typescript() {
|
|
||||||
print_header "TypeScript Checks"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Type check
|
|
||||||
if run_check "TypeScript compilation" npm run typecheck; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
print_error "TypeScript type checking failed"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Lint
|
|
||||||
if run_check "ESLint" npm run lint; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
print_warning "ESLint found issues (non-blocking)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Unit tests (if present)
|
|
||||||
if [ -f "$PROJECT_ROOT/package.json" ] && grep -q '"test"' "$PROJECT_ROOT/package.json"; then
|
|
||||||
if run_check "Unit tests" npm test; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
print_warning "Unit tests failed (non-blocking)"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
print_warning "No unit tests configured"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Build checks
|
|
||||||
check_build() {
|
|
||||||
print_header "Build Checks"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Run build
|
|
||||||
if run_check "npm run build" npm run build; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
print_error "Build failed - this will break publish"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Verify dist/ exists
|
|
||||||
if [ ! -d "$PROJECT_ROOT/dist" ]; then
|
|
||||||
print_error "dist/ directory not found after build"
|
|
||||||
return 1
|
|
||||||
else
|
|
||||||
print_success "dist/ directory exists"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Package checks
|
|
||||||
check_package() {
|
|
||||||
print_header "Package Checks"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Run npm pack --dry-run
|
|
||||||
print_info "Running npm pack --dry-run..."
|
|
||||||
PACK_OUTPUT=$(npm pack --dry-run 2>&1)
|
|
||||||
PACK_EXIT=$?
|
|
||||||
|
|
||||||
if [ $PACK_EXIT -ne 0 ]; then
|
|
||||||
print_error "npm pack --dry-run failed"
|
|
||||||
echo "$PACK_OUTPUT"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Extract file list from pack output (handle both "===" and plain "Tarball Contents" formats)
|
|
||||||
# Only include actual file entries (lines starting with size like "556B", "1.1kB", etc.)
|
|
||||||
# This excludes metadata lines like "filename: ... .tgz" from Tarball Details section
|
|
||||||
PACK_FILES=$(echo "$PACK_OUTPUT" | grep -A 10000 -E "npm notice === Tarball Contents ===|npm notice Tarball Contents" | grep "npm notice" | sed 's/npm notice //' | grep -v "^===" | grep -v "^Tarball Contents$" | grep -E '^[0-9]')
|
|
||||||
|
|
||||||
# If still empty, try alternative format (without "===" header)
|
|
||||||
if [ -z "$PACK_FILES" ]; then
|
|
||||||
# Extract only file entries (lines starting with size pattern)
|
|
||||||
PACK_FILES=$(echo "$PACK_OUTPUT" | grep "npm notice" | sed 's/npm notice //' | grep -E '^[0-9]' | grep -v "^package size:" | grep -v "^$")
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If still empty, fallback to all npm notice lines (but exclude known metadata)
|
|
||||||
if [ -z "$PACK_FILES" ]; then
|
|
||||||
PACK_FILES=$(echo "$PACK_OUTPUT" | grep "npm notice" | sed 's/npm notice //' | grep -v "^package size:" | grep -v "^name:" | grep -v "^version:" | grep -v "^filename:" | grep -v "^shasum:" | grep -v "^integrity:" | grep -v "^total files:" | grep -v "^$")
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for required files
|
|
||||||
if echo "$PACK_FILES" | grep -q "CapacitorDailyNotification.podspec"; then
|
|
||||||
print_success "Podspec included in package"
|
|
||||||
else
|
|
||||||
print_error "Podspec missing from package (check package.json 'files' field)"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if echo "$PACK_FILES" | grep -q "dist/"; then
|
|
||||||
print_success "dist/ included in package"
|
|
||||||
else
|
|
||||||
print_error "dist/ missing from package"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if echo "$PACK_FILES" | grep -q "android/"; then
|
|
||||||
print_success "android/ included in package"
|
|
||||||
else
|
|
||||||
print_warning "android/ not in package (may be intentional)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if echo "$PACK_FILES" | grep -q "ios/"; then
|
|
||||||
print_success "ios/ included in package"
|
|
||||||
else
|
|
||||||
print_warning "ios/ not in package (may be intentional)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for forbidden files (hard fail)
|
|
||||||
# Patterns: Xcode user state, build artifacts, test apps, editor temp files, macOS junk
|
|
||||||
FORBIDDEN_PATTERNS="xcuserdata/|\.xcuserstate|DerivedData/|\.tgz|ios/App/|\.DS_Store|\.swp|\.swo|\.orig|\.rej"
|
|
||||||
FORBIDDEN_FOUND=$(echo "$PACK_FILES" | grep -E "$FORBIDDEN_PATTERNS" || true)
|
|
||||||
|
|
||||||
if [ -n "$FORBIDDEN_FOUND" ]; then
|
|
||||||
print_error "Forbidden files found in package (update package.json 'files' field):"
|
|
||||||
echo "$FORBIDDEN_FOUND" | while read -r line; do
|
|
||||||
echo " - $line"
|
|
||||||
done
|
|
||||||
print_info "Fix: Tighten package.json 'files' field to exclude ios/App/ and Xcode user state files"
|
|
||||||
print_info "Or add to .npmignore: **/xcuserdata/**, **/*.xcuserstate, **/DerivedData/**, ios/App/**, .DS_Store, *.swp, *.swo, *.orig, *.rej"
|
|
||||||
return 1
|
|
||||||
else
|
|
||||||
print_success "No forbidden files (xcuserdata, xcuserstate, DerivedData, ios/App/, .DS_Store, editor temp files) in package"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for unwanted files (warnings)
|
|
||||||
if echo "$PACK_FILES" | grep -q "test-apps/"; then
|
|
||||||
print_warning "test-apps/ found in package (should be excluded)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if echo "$PACK_FILES" | grep -q "docs/"; then
|
|
||||||
print_warning "docs/ found in package (should be excluded)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if echo "$PACK_FILES" | grep -q "node_modules/"; then
|
|
||||||
print_warning "node_modules/ found in package (should be excluded)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Print package manifest summary (first 20 lines)
|
|
||||||
print_info "Package manifest summary (showing first 20 of $(echo "$PACK_FILES" | wc -l) files):"
|
|
||||||
echo "$PACK_FILES" | head -20 | while read -r line; do
|
|
||||||
echo " $line"
|
|
||||||
done
|
|
||||||
TOTAL_FILES=$(echo "$PACK_FILES" | wc -l)
|
|
||||||
if [ "$TOTAL_FILES" -gt 20 ]; then
|
|
||||||
print_info "... and $((TOTAL_FILES - 20)) more files"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Android checks (best effort)
|
|
||||||
check_android() {
|
|
||||||
print_header "Android Checks"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
if [ ! -d "$PROJECT_ROOT/android" ]; then
|
|
||||||
print_warning "Android directory not found, skipping Android checks"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! command_exists java; then
|
|
||||||
print_warning "Java not found, skipping Android build checks"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT/android"
|
|
||||||
|
|
||||||
# Check if gradlew exists
|
|
||||||
if [ ! -f "$PROJECT_ROOT/android/gradlew" ]; then
|
|
||||||
print_warning "gradlew not found, skipping Android build"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to run a minimal gradle task
|
|
||||||
if run_check "Android build (compile)" ./gradlew compileDebugJavaWithJavac --no-daemon; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
print_warning "Android build check failed (non-blocking)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# iOS checks (best effort)
|
|
||||||
check_ios() {
|
|
||||||
print_header "iOS Checks"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
if [ ! -d "$PROJECT_ROOT/ios" ]; then
|
|
||||||
print_warning "iOS directory not found, skipping iOS checks"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! command_exists xcodebuild; then
|
|
||||||
print_warning "xcodebuild not found, skipping iOS build checks"
|
|
||||||
print_info "Manual iOS build command: cd ios && xcodebuild -workspace DailyNotificationPlugin.xcworkspace -scheme DailyNotificationPlugin -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15' build"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if Podfile exists
|
|
||||||
if [ ! -f "$PROJECT_ROOT/ios/Podfile" ]; then
|
|
||||||
print_warning "Podfile not found, skipping iOS build"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to build (best effort, may fail in CI)
|
|
||||||
# Note: Don't use pipe in run_check - it won't work. Capture output separately.
|
|
||||||
cd "$PROJECT_ROOT/ios"
|
|
||||||
BUILD_OUTPUT=$(xcodebuild -workspace DailyNotificationPlugin.xcworkspace -scheme DailyNotificationPlugin -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15' build 2>&1)
|
|
||||||
BUILD_EXIT=$?
|
|
||||||
|
|
||||||
if [ $BUILD_EXIT -eq 0 ]; then
|
|
||||||
print_success "iOS build (compile)"
|
|
||||||
# Show first 10 lines of output for context
|
|
||||||
echo "$BUILD_OUTPUT" | head -10 | while read -r line; do
|
|
||||||
echo " $line"
|
|
||||||
done
|
|
||||||
else
|
|
||||||
print_warning "iOS build check failed (non-blocking - may require manual setup)"
|
|
||||||
print_info "Manual iOS build command: cd ios && xcodebuild -workspace DailyNotificationPlugin.xcworkspace -scheme DailyNotificationPlugin -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15' build"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to run tests (best effort)
|
|
||||||
print_info "Running iOS tests..."
|
|
||||||
TEST_OUTPUT=$(xcodebuild test -workspace DailyNotificationPlugin.xcworkspace -scheme DailyNotificationPlugin -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15' -only-testing:DailyNotificationPluginTests/DailyNotificationRecoveryTests 2>&1)
|
|
||||||
TEST_EXIT=$?
|
|
||||||
|
|
||||||
if [ $TEST_EXIT -eq 0 ]; then
|
|
||||||
print_success "iOS recovery tests passed"
|
|
||||||
# Show test summary if available
|
|
||||||
echo "$TEST_OUTPUT" | grep -E "Test Suite|Test Case|passed|failed" | head -10 | while read -r line; do
|
|
||||||
echo " $line"
|
|
||||||
done
|
|
||||||
else
|
|
||||||
print_warning "iOS tests failed or not available (non-blocking)"
|
|
||||||
print_info "Manual iOS test command: cd ios && xcodebuild test -workspace DailyNotificationPlugin.xcworkspace -scheme DailyNotificationPlugin -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15'"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Check for native code in src/
|
|
||||||
# Check core module source (can run before build)
|
|
||||||
check_core_source() {
|
|
||||||
print_header "Core Module (Source) Checks"
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Require core source dir + expected files
|
|
||||||
if [ ! -d "src/core" ]; then
|
|
||||||
print_error "Missing src/core/"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
local required=(
|
|
||||||
"src/core/index.ts"
|
|
||||||
"src/core/errors.ts"
|
|
||||||
"src/core/enums.ts"
|
|
||||||
"src/core/events.ts"
|
|
||||||
"src/core/contracts.ts"
|
|
||||||
"src/core/guards.ts"
|
|
||||||
)
|
|
||||||
|
|
||||||
local missing=0
|
|
||||||
for f in "${required[@]}"; do
|
|
||||||
if [ ! -f "$f" ]; then
|
|
||||||
print_error "Missing core file: $f"
|
|
||||||
missing=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ $missing -ne 0 ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# No platform imports inside core
|
|
||||||
# Block Node builtins, React, Capacitor, and other platform-specific modules
|
|
||||||
local NODE_BUILTINS="(fs|path|os|child_process|crypto|http|https|net|tls|zlib|stream|util|url|worker_threads|perf_hooks|vm)"
|
|
||||||
local bad
|
|
||||||
bad=$(grep -RInE \
|
|
||||||
"(from\s+['\"]|require\s*\(\s*['\"]|import\s*\(\s*['\"])(${NODE_BUILTINS}|react|@capacitor/|capacitor)['\"]" \
|
|
||||||
src/core 2>/dev/null || true)
|
|
||||||
|
|
||||||
if [ -n "$bad" ]; then
|
|
||||||
print_error "Core module contains forbidden platform imports:"
|
|
||||||
echo "$bad" | head -50 | while read -r line; do
|
|
||||||
echo " $line"
|
|
||||||
done
|
|
||||||
echo ""
|
|
||||||
echo "Policy: src/core must not import platform, Node, or framework-specific modules."
|
|
||||||
echo "Move platform-dependent code to src/web/ or platform adapters."
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
print_success "Core source checks passed"
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Check core module build artifacts (must run after build)
|
|
||||||
check_core_artifacts() {
|
|
||||||
print_header "Core Module (Build Artifacts) Checks"
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Require build outputs for core
|
|
||||||
local required=(
|
|
||||||
"dist/esm/core/index.js"
|
|
||||||
"dist/esm/core/index.d.ts"
|
|
||||||
)
|
|
||||||
|
|
||||||
local missing=0
|
|
||||||
for f in "${required[@]}"; do
|
|
||||||
if [ ! -f "$f" ]; then
|
|
||||||
print_error "Missing build artifact: $f (did build run?)"
|
|
||||||
missing=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ $missing -ne 0 ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Require package.json export for ./core
|
|
||||||
if ! node -e "const p=require('./package.json'); if(!p.exports||!p.exports['./core']) process.exit(1);" 2>/dev/null; then
|
|
||||||
print_error "package.json missing exports['./core']"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
print_success "Core artifact checks passed"
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
check_native_code_in_src() {
|
|
||||||
print_header "Checking for Native Code in src/"
|
|
||||||
|
|
||||||
cd "$PROJECT_ROOT"
|
|
||||||
|
|
||||||
# Check for Java files
|
|
||||||
if find src/android -name "*.java" -type f 2>/dev/null | grep -q .; then
|
|
||||||
print_error "Found Java files in src/android/ (should be removed)"
|
|
||||||
find src/android -name "*.java" -type f 2>/dev/null | while read -r file; do
|
|
||||||
echo " - $file"
|
|
||||||
done
|
|
||||||
return 1
|
|
||||||
else
|
|
||||||
print_success "No Java files in src/android/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for Swift/Objective-C files
|
|
||||||
if find src/ios -name "*.swift" -o -name "*.m" -o -name "*.mm" -o -name "*.h" 2>/dev/null | grep -q .; then
|
|
||||||
print_error "Found native code files in src/ios/ (should be removed)"
|
|
||||||
find src/ios -name "*.swift" -o -name "*.m" -o -name "*.mm" -o -name "*.h" 2>/dev/null | while read -r file; do
|
|
||||||
echo " - $file"
|
|
||||||
done
|
|
||||||
return 1
|
|
||||||
else
|
|
||||||
print_success "No native code files in src/ios/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
}
|
|
||||||
|
|
||||||
# Main execution
|
|
||||||
main() {
|
|
||||||
print_header "Daily Notification Plugin - Verification"
|
|
||||||
|
|
||||||
print_environment
|
|
||||||
install_dependencies
|
|
||||||
|
|
||||||
run_check "Native code not in src/" check_native_code_in_src
|
|
||||||
|
|
||||||
# Core source checks must be before build
|
|
||||||
run_check "Core module source checks" check_core_source
|
|
||||||
|
|
||||||
run_check "TypeScript typecheck" check_typescript
|
|
||||||
run_check "Build" check_build
|
|
||||||
|
|
||||||
# Core artifacts checks must be after build
|
|
||||||
run_check "Core module artifact checks" check_core_artifacts
|
|
||||||
|
|
||||||
run_check "Package checks" check_package
|
|
||||||
|
|
||||||
check_android
|
|
||||||
check_ios
|
|
||||||
|
|
||||||
# Summary
|
|
||||||
print_header "Verification Summary"
|
|
||||||
echo "Passed: $PASSED"
|
|
||||||
echo "Failed: $FAILED"
|
|
||||||
echo "Skipped: $SKIPPED"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
if [ $FAILED -eq 0 ]; then
|
|
||||||
print_success "All critical checks passed!"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
print_error "Some checks failed. Review output above."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Run main
|
|
||||||
main "$@"
|
|
||||||
|
|
||||||
215
src/android/DailyNotificationDatabaseTest.java
Normal file
215
src/android/DailyNotificationDatabaseTest.java
Normal file
@@ -0,0 +1,215 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationDatabaseTest.java
|
||||||
|
*
|
||||||
|
* Unit tests for SQLite database functionality
|
||||||
|
* Tests schema creation, WAL mode, and basic operations
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
import android.test.mock.MockContext;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unit tests for DailyNotificationDatabase
|
||||||
|
*
|
||||||
|
* Tests the core SQLite functionality including:
|
||||||
|
* - Database creation and schema
|
||||||
|
* - WAL mode configuration
|
||||||
|
* - Table and index creation
|
||||||
|
* - Schema version management
|
||||||
|
*/
|
||||||
|
public class DailyNotificationDatabaseTest extends AndroidTestCase {
|
||||||
|
|
||||||
|
private DailyNotificationDatabase database;
|
||||||
|
private Context mockContext;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
|
||||||
|
// Create mock context
|
||||||
|
mockContext = new MockContext() {
|
||||||
|
@Override
|
||||||
|
public File getDatabasePath(String name) {
|
||||||
|
return new File(getContext().getCacheDir(), name);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create database instance
|
||||||
|
database = new DailyNotificationDatabase(mockContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
if (database != null) {
|
||||||
|
database.close();
|
||||||
|
}
|
||||||
|
super.tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test database creation and schema
|
||||||
|
*/
|
||||||
|
public void testDatabaseCreation() {
|
||||||
|
assertNotNull("Database should not be null", database);
|
||||||
|
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
assertNotNull("Readable database should not be null", db);
|
||||||
|
assertTrue("Database should be open", db.isOpen());
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test WAL mode configuration
|
||||||
|
*/
|
||||||
|
public void testWALModeConfiguration() {
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Check journal mode
|
||||||
|
android.database.Cursor cursor = db.rawQuery("PRAGMA journal_mode", null);
|
||||||
|
assertTrue("Should have journal mode result", cursor.moveToFirst());
|
||||||
|
String journalMode = cursor.getString(0);
|
||||||
|
assertEquals("Journal mode should be WAL", "wal", journalMode.toLowerCase());
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
// Check synchronous mode
|
||||||
|
cursor = db.rawQuery("PRAGMA synchronous", null);
|
||||||
|
assertTrue("Should have synchronous result", cursor.moveToFirst());
|
||||||
|
int synchronous = cursor.getInt(0);
|
||||||
|
assertEquals("Synchronous mode should be NORMAL", 1, synchronous);
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
// Check foreign keys
|
||||||
|
cursor = db.rawQuery("PRAGMA foreign_keys", null);
|
||||||
|
assertTrue("Should have foreign_keys result", cursor.moveToFirst());
|
||||||
|
int foreignKeys = cursor.getInt(0);
|
||||||
|
assertEquals("Foreign keys should be enabled", 1, foreignKeys);
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test table creation
|
||||||
|
*/
|
||||||
|
public void testTableCreation() {
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Check if tables exist
|
||||||
|
assertTrue("notif_contents table should exist",
|
||||||
|
tableExists(db, DailyNotificationDatabase.TABLE_NOTIF_CONTENTS));
|
||||||
|
assertTrue("notif_deliveries table should exist",
|
||||||
|
tableExists(db, DailyNotificationDatabase.TABLE_NOTIF_DELIVERIES));
|
||||||
|
assertTrue("notif_config table should exist",
|
||||||
|
tableExists(db, DailyNotificationDatabase.TABLE_NOTIF_CONFIG));
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test index creation
|
||||||
|
*/
|
||||||
|
public void testIndexCreation() {
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Check if indexes exist
|
||||||
|
assertTrue("notif_idx_contents_slot_time index should exist",
|
||||||
|
indexExists(db, "notif_idx_contents_slot_time"));
|
||||||
|
assertTrue("notif_idx_deliveries_slot index should exist",
|
||||||
|
indexExists(db, "notif_idx_deliveries_slot"));
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test schema version management
|
||||||
|
*/
|
||||||
|
public void testSchemaVersion() {
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Check user_version
|
||||||
|
android.database.Cursor cursor = db.rawQuery("PRAGMA user_version", null);
|
||||||
|
assertTrue("Should have user_version result", cursor.moveToFirst());
|
||||||
|
int userVersion = cursor.getInt(0);
|
||||||
|
assertEquals("User version should match database version",
|
||||||
|
DailyNotificationDatabase.DATABASE_VERSION, userVersion);
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test basic insert operations
|
||||||
|
*/
|
||||||
|
public void testBasicInsertOperations() {
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Test inserting into notif_contents
|
||||||
|
android.content.ContentValues values = new android.content.ContentValues();
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONTENTS_SLOT_ID, "test_slot_1");
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONTENTS_PAYLOAD_JSON, "{\"title\":\"Test\"}");
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONTENTS_FETCHED_AT, System.currentTimeMillis());
|
||||||
|
|
||||||
|
long rowId = db.insert(DailyNotificationDatabase.TABLE_NOTIF_CONTENTS, null, values);
|
||||||
|
assertTrue("Insert should succeed", rowId > 0);
|
||||||
|
|
||||||
|
// Test inserting into notif_config
|
||||||
|
values.clear();
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_K, "test_key");
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_V, "test_value");
|
||||||
|
|
||||||
|
rowId = db.insert(DailyNotificationDatabase.TABLE_NOTIF_CONFIG, null, values);
|
||||||
|
assertTrue("Config insert should succeed", rowId > 0);
|
||||||
|
|
||||||
|
db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test database file operations
|
||||||
|
*/
|
||||||
|
public void testDatabaseFileOperations() {
|
||||||
|
String dbPath = database.getDatabasePath();
|
||||||
|
assertNotNull("Database path should not be null", dbPath);
|
||||||
|
assertTrue("Database path should not be empty", !dbPath.isEmpty());
|
||||||
|
|
||||||
|
// Database should exist after creation
|
||||||
|
assertTrue("Database file should exist", database.databaseExists());
|
||||||
|
|
||||||
|
// Database size should be greater than 0
|
||||||
|
long size = database.getDatabaseSize();
|
||||||
|
assertTrue("Database size should be greater than 0", size > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper method to check if table exists
|
||||||
|
*/
|
||||||
|
private boolean tableExists(SQLiteDatabase db, String tableName) {
|
||||||
|
android.database.Cursor cursor = db.rawQuery(
|
||||||
|
"SELECT name FROM sqlite_master WHERE type='table' AND name=?",
|
||||||
|
new String[]{tableName});
|
||||||
|
boolean exists = cursor.moveToFirst();
|
||||||
|
cursor.close();
|
||||||
|
return exists;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper method to check if index exists
|
||||||
|
*/
|
||||||
|
private boolean indexExists(SQLiteDatabase db, String indexName) {
|
||||||
|
android.database.Cursor cursor = db.rawQuery(
|
||||||
|
"SELECT name FROM sqlite_master WHERE type='index' AND name=?",
|
||||||
|
new String[]{indexName});
|
||||||
|
boolean exists = cursor.moveToFirst();
|
||||||
|
cursor.close();
|
||||||
|
return exists;
|
||||||
|
}
|
||||||
|
}
|
||||||
482
src/android/DailyNotificationETagManager.java
Normal file
482
src/android/DailyNotificationETagManager.java
Normal file
@@ -0,0 +1,482 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationETagManager.java
|
||||||
|
*
|
||||||
|
* Android ETag Manager for efficient content fetching
|
||||||
|
* Implements ETag headers, 304 response handling, and conditional requests
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages ETag headers and conditional requests for efficient content fetching
|
||||||
|
*
|
||||||
|
* This class implements the critical ETag functionality:
|
||||||
|
* - Stores ETag values for each content URL
|
||||||
|
* - Sends conditional requests with If-None-Match headers
|
||||||
|
* - Handles 304 Not Modified responses
|
||||||
|
* - Tracks network efficiency metrics
|
||||||
|
* - Provides fallback for ETag failures
|
||||||
|
*/
|
||||||
|
public class DailyNotificationETagManager {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationETagManager";
|
||||||
|
|
||||||
|
// HTTP headers
|
||||||
|
private static final String HEADER_ETAG = "ETag";
|
||||||
|
private static final String HEADER_IF_NONE_MATCH = "If-None-Match";
|
||||||
|
private static final String HEADER_LAST_MODIFIED = "Last-Modified";
|
||||||
|
private static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
|
||||||
|
|
||||||
|
// HTTP status codes
|
||||||
|
private static final int HTTP_NOT_MODIFIED = 304;
|
||||||
|
private static final int HTTP_OK = 200;
|
||||||
|
|
||||||
|
// Request timeout
|
||||||
|
private static final int REQUEST_TIMEOUT_MS = 12000; // 12 seconds
|
||||||
|
|
||||||
|
// ETag cache TTL
|
||||||
|
private static final long ETAG_CACHE_TTL_MS = TimeUnit.HOURS.toMillis(24); // 24 hours
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final DailyNotificationStorage storage;
|
||||||
|
|
||||||
|
// ETag cache: URL -> ETagInfo
|
||||||
|
private final ConcurrentHashMap<String, ETagInfo> etagCache;
|
||||||
|
|
||||||
|
// Network metrics
|
||||||
|
private final NetworkMetrics metrics;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param storage Storage instance for persistence
|
||||||
|
*/
|
||||||
|
public DailyNotificationETagManager(DailyNotificationStorage storage) {
|
||||||
|
this.storage = storage;
|
||||||
|
this.etagCache = new ConcurrentHashMap<>();
|
||||||
|
this.metrics = new NetworkMetrics();
|
||||||
|
|
||||||
|
// Load ETag cache from storage
|
||||||
|
loadETagCache();
|
||||||
|
|
||||||
|
Log.d(TAG, "ETagManager initialized with " + etagCache.size() + " cached ETags");
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - ETag Cache Management
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load ETag cache from storage
|
||||||
|
*/
|
||||||
|
private void loadETagCache() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Loading ETag cache from storage");
|
||||||
|
|
||||||
|
// This would typically load from SQLite or SharedPreferences
|
||||||
|
// For now, we'll start with an empty cache
|
||||||
|
Log.d(TAG, "ETag cache loaded from storage");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error loading ETag cache", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save ETag cache to storage
|
||||||
|
*/
|
||||||
|
private void saveETagCache() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Saving ETag cache to storage");
|
||||||
|
|
||||||
|
// This would typically save to SQLite or SharedPreferences
|
||||||
|
// For now, we'll just log the action
|
||||||
|
Log.d(TAG, "ETag cache saved to storage");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error saving ETag cache", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get ETag for URL
|
||||||
|
*
|
||||||
|
* @param url Content URL
|
||||||
|
* @return ETag value or null if not cached
|
||||||
|
*/
|
||||||
|
public String getETag(String url) {
|
||||||
|
ETagInfo info = etagCache.get(url);
|
||||||
|
if (info != null && !info.isExpired()) {
|
||||||
|
return info.etag;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set ETag for URL
|
||||||
|
*
|
||||||
|
* @param url Content URL
|
||||||
|
* @param etag ETag value
|
||||||
|
*/
|
||||||
|
public void setETag(String url, String etag) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Setting ETag for " + url + ": " + etag);
|
||||||
|
|
||||||
|
ETagInfo info = new ETagInfo(etag, System.currentTimeMillis());
|
||||||
|
etagCache.put(url, info);
|
||||||
|
|
||||||
|
// Save to persistent storage
|
||||||
|
saveETagCache();
|
||||||
|
|
||||||
|
Log.d(TAG, "ETag set successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error setting ETag", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove ETag for URL
|
||||||
|
*
|
||||||
|
* @param url Content URL
|
||||||
|
*/
|
||||||
|
public void removeETag(String url) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Removing ETag for " + url);
|
||||||
|
|
||||||
|
etagCache.remove(url);
|
||||||
|
saveETagCache();
|
||||||
|
|
||||||
|
Log.d(TAG, "ETag removed successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error removing ETag", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear all ETags
|
||||||
|
*/
|
||||||
|
public void clearETags() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Clearing all ETags");
|
||||||
|
|
||||||
|
etagCache.clear();
|
||||||
|
saveETagCache();
|
||||||
|
|
||||||
|
Log.d(TAG, "All ETags cleared");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error clearing ETags", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Conditional Requests
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make conditional request with ETag
|
||||||
|
*
|
||||||
|
* @param url Content URL
|
||||||
|
* @return ConditionalRequestResult with response data
|
||||||
|
*/
|
||||||
|
public ConditionalRequestResult makeConditionalRequest(String url) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Making conditional request to " + url);
|
||||||
|
|
||||||
|
// Get cached ETag
|
||||||
|
String etag = getETag(url);
|
||||||
|
|
||||||
|
// Create HTTP connection
|
||||||
|
HttpURLConnection connection = createConnection(url, etag);
|
||||||
|
|
||||||
|
// Execute request
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
// Handle response
|
||||||
|
ConditionalRequestResult result = handleResponse(connection, responseCode, url);
|
||||||
|
|
||||||
|
// Update metrics
|
||||||
|
metrics.recordRequest(url, responseCode, result.isFromCache);
|
||||||
|
|
||||||
|
Log.i(TAG, "Conditional request completed: " + responseCode + " (cached: " + result.isFromCache + ")");
|
||||||
|
|
||||||
|
return result;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error making conditional request", e);
|
||||||
|
metrics.recordError(url, e.getMessage());
|
||||||
|
return ConditionalRequestResult.error(e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create HTTP connection with conditional headers
|
||||||
|
*
|
||||||
|
* @param url Content URL
|
||||||
|
* @param etag ETag value for conditional request
|
||||||
|
* @return Configured HttpURLConnection
|
||||||
|
*/
|
||||||
|
private HttpURLConnection createConnection(String url, String etag) throws IOException {
|
||||||
|
URL urlObj = new URL(url);
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) urlObj.openConnection();
|
||||||
|
|
||||||
|
// Set request timeout
|
||||||
|
connection.setConnectTimeout(REQUEST_TIMEOUT_MS);
|
||||||
|
connection.setReadTimeout(REQUEST_TIMEOUT_MS);
|
||||||
|
|
||||||
|
// Set conditional headers
|
||||||
|
if (etag != null) {
|
||||||
|
connection.setRequestProperty(HEADER_IF_NONE_MATCH, etag);
|
||||||
|
Log.d(TAG, "Added If-None-Match header: " + etag);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set user agent
|
||||||
|
connection.setRequestProperty("User-Agent", "DailyNotificationPlugin/1.0.0");
|
||||||
|
|
||||||
|
return connection;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle HTTP response
|
||||||
|
*
|
||||||
|
* @param connection HTTP connection
|
||||||
|
* @param responseCode HTTP response code
|
||||||
|
* @param url Request URL
|
||||||
|
* @return ConditionalRequestResult
|
||||||
|
*/
|
||||||
|
private ConditionalRequestResult handleResponse(HttpURLConnection connection, int responseCode, String url) {
|
||||||
|
try {
|
||||||
|
switch (responseCode) {
|
||||||
|
case HTTP_NOT_MODIFIED:
|
||||||
|
Log.d(TAG, "304 Not Modified - using cached content");
|
||||||
|
return ConditionalRequestResult.notModified();
|
||||||
|
|
||||||
|
case HTTP_OK:
|
||||||
|
Log.d(TAG, "200 OK - new content available");
|
||||||
|
return handleOKResponse(connection, url);
|
||||||
|
|
||||||
|
default:
|
||||||
|
Log.w(TAG, "Unexpected response code: " + responseCode);
|
||||||
|
return ConditionalRequestResult.error("Unexpected response code: " + responseCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling response", e);
|
||||||
|
return ConditionalRequestResult.error(e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle 200 OK response
|
||||||
|
*
|
||||||
|
* @param connection HTTP connection
|
||||||
|
* @param url Request URL
|
||||||
|
* @return ConditionalRequestResult with new content
|
||||||
|
*/
|
||||||
|
private ConditionalRequestResult handleOKResponse(HttpURLConnection connection, String url) {
|
||||||
|
try {
|
||||||
|
// Get new ETag
|
||||||
|
String newETag = connection.getHeaderField(HEADER_ETAG);
|
||||||
|
|
||||||
|
// Read response body
|
||||||
|
String content = readResponseBody(connection);
|
||||||
|
|
||||||
|
// Update ETag cache
|
||||||
|
if (newETag != null) {
|
||||||
|
setETag(url, newETag);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ConditionalRequestResult.success(content, newETag);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling OK response", e);
|
||||||
|
return ConditionalRequestResult.error(e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read response body from connection
|
||||||
|
*
|
||||||
|
* @param connection HTTP connection
|
||||||
|
* @return Response body as string
|
||||||
|
*/
|
||||||
|
private String readResponseBody(HttpURLConnection connection) throws IOException {
|
||||||
|
// This is a simplified implementation
|
||||||
|
// In production, you'd want proper stream handling
|
||||||
|
return "Response body content"; // Placeholder
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Network Metrics
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get network efficiency metrics
|
||||||
|
*
|
||||||
|
* @return NetworkMetrics with current statistics
|
||||||
|
*/
|
||||||
|
public NetworkMetrics getMetrics() {
|
||||||
|
return metrics;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reset network metrics
|
||||||
|
*/
|
||||||
|
public void resetMetrics() {
|
||||||
|
metrics.reset();
|
||||||
|
Log.d(TAG, "Network metrics reset");
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Cache Management
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clean expired ETags
|
||||||
|
*/
|
||||||
|
public void cleanExpiredETags() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Cleaning expired ETags");
|
||||||
|
|
||||||
|
int initialSize = etagCache.size();
|
||||||
|
etagCache.entrySet().removeIf(entry -> entry.getValue().isExpired());
|
||||||
|
int finalSize = etagCache.size();
|
||||||
|
|
||||||
|
if (initialSize != finalSize) {
|
||||||
|
saveETagCache();
|
||||||
|
Log.i(TAG, "Cleaned " + (initialSize - finalSize) + " expired ETags");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error cleaning expired ETags", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get cache statistics
|
||||||
|
*
|
||||||
|
* @return CacheStatistics with cache info
|
||||||
|
*/
|
||||||
|
public CacheStatistics getCacheStatistics() {
|
||||||
|
int totalETags = etagCache.size();
|
||||||
|
int expiredETags = (int) etagCache.values().stream().filter(ETagInfo::isExpired).count();
|
||||||
|
|
||||||
|
return new CacheStatistics(totalETags, expiredETags, totalETags - expiredETags);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Data Classes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ETag information
|
||||||
|
*/
|
||||||
|
private static class ETagInfo {
|
||||||
|
public final String etag;
|
||||||
|
public final long timestamp;
|
||||||
|
|
||||||
|
public ETagInfo(String etag, long timestamp) {
|
||||||
|
this.etag = etag;
|
||||||
|
this.timestamp = timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isExpired() {
|
||||||
|
return System.currentTimeMillis() - timestamp > ETAG_CACHE_TTL_MS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Conditional request result
|
||||||
|
*/
|
||||||
|
public static class ConditionalRequestResult {
|
||||||
|
public final boolean success;
|
||||||
|
public final boolean isFromCache;
|
||||||
|
public final String content;
|
||||||
|
public final String etag;
|
||||||
|
public final String error;
|
||||||
|
|
||||||
|
private ConditionalRequestResult(boolean success, boolean isFromCache, String content, String etag, String error) {
|
||||||
|
this.success = success;
|
||||||
|
this.isFromCache = isFromCache;
|
||||||
|
this.content = content;
|
||||||
|
this.etag = etag;
|
||||||
|
this.error = error;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ConditionalRequestResult success(String content, String etag) {
|
||||||
|
return new ConditionalRequestResult(true, false, content, etag, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ConditionalRequestResult notModified() {
|
||||||
|
return new ConditionalRequestResult(true, true, null, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ConditionalRequestResult error(String error) {
|
||||||
|
return new ConditionalRequestResult(false, false, null, null, error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Network metrics
|
||||||
|
*/
|
||||||
|
public static class NetworkMetrics {
|
||||||
|
public int totalRequests = 0;
|
||||||
|
public int cachedResponses = 0;
|
||||||
|
public int networkResponses = 0;
|
||||||
|
public int errors = 0;
|
||||||
|
|
||||||
|
public void recordRequest(String url, int responseCode, boolean fromCache) {
|
||||||
|
totalRequests++;
|
||||||
|
if (fromCache) {
|
||||||
|
cachedResponses++;
|
||||||
|
} else {
|
||||||
|
networkResponses++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void recordError(String url, String error) {
|
||||||
|
errors++;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void reset() {
|
||||||
|
totalRequests = 0;
|
||||||
|
cachedResponses = 0;
|
||||||
|
networkResponses = 0;
|
||||||
|
errors = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getCacheHitRatio() {
|
||||||
|
if (totalRequests == 0) return 0.0;
|
||||||
|
return (double) cachedResponses / totalRequests;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cache statistics
|
||||||
|
*/
|
||||||
|
public static class CacheStatistics {
|
||||||
|
public final int totalETags;
|
||||||
|
public final int expiredETags;
|
||||||
|
public final int validETags;
|
||||||
|
|
||||||
|
public CacheStatistics(int totalETags, int expiredETags, int validETags) {
|
||||||
|
this.totalETags = totalETags;
|
||||||
|
this.expiredETags = expiredETags;
|
||||||
|
this.validETags = validETags;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("CacheStatistics{total=%d, expired=%d, valid=%d}",
|
||||||
|
totalETags, expiredETags, validETags);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
668
src/android/DailyNotificationErrorHandler.java
Normal file
668
src/android/DailyNotificationErrorHandler.java
Normal file
@@ -0,0 +1,668 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationErrorHandler.java
|
||||||
|
*
|
||||||
|
* Android Error Handler for comprehensive error management
|
||||||
|
* Implements error categorization, retry logic, and telemetry
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages comprehensive error handling with categorization, retry logic, and telemetry
|
||||||
|
*
|
||||||
|
* This class implements the critical error handling functionality:
|
||||||
|
* - Categorizes errors by type, code, and severity
|
||||||
|
* - Implements exponential backoff retry logic
|
||||||
|
* - Tracks error metrics and telemetry
|
||||||
|
* - Provides debugging information
|
||||||
|
* - Manages retry state and limits
|
||||||
|
*/
|
||||||
|
public class DailyNotificationErrorHandler {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationErrorHandler";
|
||||||
|
|
||||||
|
// Retry configuration
|
||||||
|
private static final int DEFAULT_MAX_RETRIES = 3;
|
||||||
|
private static final long DEFAULT_BASE_DELAY_MS = 1000; // 1 second
|
||||||
|
private static final long DEFAULT_MAX_DELAY_MS = 30000; // 30 seconds
|
||||||
|
private static final double DEFAULT_BACKOFF_MULTIPLIER = 2.0;
|
||||||
|
|
||||||
|
// Error severity levels
|
||||||
|
public enum ErrorSeverity {
|
||||||
|
LOW, // Minor issues, non-critical
|
||||||
|
MEDIUM, // Moderate issues, may affect functionality
|
||||||
|
HIGH, // Serious issues, significant impact
|
||||||
|
CRITICAL // Critical issues, system failure
|
||||||
|
}
|
||||||
|
|
||||||
|
// Error categories
|
||||||
|
public enum ErrorCategory {
|
||||||
|
NETWORK, // Network-related errors
|
||||||
|
STORAGE, // Storage/database errors
|
||||||
|
SCHEDULING, // Notification scheduling errors
|
||||||
|
PERMISSION, // Permission-related errors
|
||||||
|
CONFIGURATION, // Configuration errors
|
||||||
|
SYSTEM, // System-level errors
|
||||||
|
UNKNOWN // Unknown/unclassified errors
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final ConcurrentHashMap<String, RetryState> retryStates;
|
||||||
|
private final ErrorMetrics metrics;
|
||||||
|
private final ErrorConfiguration config;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor with default configuration
|
||||||
|
*/
|
||||||
|
public DailyNotificationErrorHandler() {
|
||||||
|
this(new ErrorConfiguration());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor with custom configuration
|
||||||
|
*
|
||||||
|
* @param config Error handling configuration
|
||||||
|
*/
|
||||||
|
public DailyNotificationErrorHandler(ErrorConfiguration config) {
|
||||||
|
this.retryStates = new ConcurrentHashMap<>();
|
||||||
|
this.metrics = new ErrorMetrics();
|
||||||
|
this.config = config;
|
||||||
|
|
||||||
|
Log.d(TAG, "ErrorHandler initialized with max retries: " + config.maxRetries);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Error Handling
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle error with automatic retry logic
|
||||||
|
*
|
||||||
|
* @param operationId Unique identifier for the operation
|
||||||
|
* @param error Error to handle
|
||||||
|
* @param retryable Whether this error is retryable
|
||||||
|
* @return ErrorResult with handling information
|
||||||
|
*/
|
||||||
|
public ErrorResult handleError(String operationId, Throwable error, boolean retryable) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Handling error for operation: " + operationId);
|
||||||
|
|
||||||
|
// Categorize error
|
||||||
|
ErrorInfo errorInfo = categorizeError(error);
|
||||||
|
|
||||||
|
// Update metrics
|
||||||
|
metrics.recordError(errorInfo);
|
||||||
|
|
||||||
|
// Check if retryable and within limits
|
||||||
|
if (retryable && shouldRetry(operationId, errorInfo)) {
|
||||||
|
return handleRetryableError(operationId, errorInfo);
|
||||||
|
} else {
|
||||||
|
return handleNonRetryableError(operationId, errorInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error in error handler", e);
|
||||||
|
return ErrorResult.fatal("Error handler failure: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle error with custom retry configuration
|
||||||
|
*
|
||||||
|
* @param operationId Unique identifier for the operation
|
||||||
|
* @param error Error to handle
|
||||||
|
* @param retryConfig Custom retry configuration
|
||||||
|
* @return ErrorResult with handling information
|
||||||
|
*/
|
||||||
|
public ErrorResult handleError(String operationId, Throwable error, RetryConfiguration retryConfig) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Handling error with custom retry config for operation: " + operationId);
|
||||||
|
|
||||||
|
// Categorize error
|
||||||
|
ErrorInfo errorInfo = categorizeError(error);
|
||||||
|
|
||||||
|
// Update metrics
|
||||||
|
metrics.recordError(errorInfo);
|
||||||
|
|
||||||
|
// Check if retryable with custom config
|
||||||
|
if (shouldRetry(operationId, errorInfo, retryConfig)) {
|
||||||
|
return handleRetryableError(operationId, errorInfo, retryConfig);
|
||||||
|
} else {
|
||||||
|
return handleNonRetryableError(operationId, errorInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error in error handler with custom config", e);
|
||||||
|
return ErrorResult.fatal("Error handler failure: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Error Categorization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Categorize error by type, code, and severity
|
||||||
|
*
|
||||||
|
* @param error Error to categorize
|
||||||
|
* @return ErrorInfo with categorization
|
||||||
|
*/
|
||||||
|
private ErrorInfo categorizeError(Throwable error) {
|
||||||
|
try {
|
||||||
|
ErrorCategory category = determineCategory(error);
|
||||||
|
String errorCode = determineErrorCode(error);
|
||||||
|
ErrorSeverity severity = determineSeverity(error, category);
|
||||||
|
|
||||||
|
ErrorInfo errorInfo = new ErrorInfo(
|
||||||
|
error,
|
||||||
|
category,
|
||||||
|
errorCode,
|
||||||
|
severity,
|
||||||
|
System.currentTimeMillis()
|
||||||
|
);
|
||||||
|
|
||||||
|
Log.d(TAG, "Error categorized: " + errorInfo);
|
||||||
|
return errorInfo;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during categorization", e);
|
||||||
|
return new ErrorInfo(error, ErrorCategory.UNKNOWN, "CATEGORIZATION_FAILED", ErrorSeverity.HIGH, System.currentTimeMillis());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine error category based on error type
|
||||||
|
*
|
||||||
|
* @param error Error to analyze
|
||||||
|
* @return ErrorCategory
|
||||||
|
*/
|
||||||
|
private ErrorCategory determineCategory(Throwable error) {
|
||||||
|
String errorMessage = error.getMessage();
|
||||||
|
String errorType = error.getClass().getSimpleName();
|
||||||
|
|
||||||
|
// Network errors
|
||||||
|
if (errorType.contains("IOException") || errorType.contains("Socket") ||
|
||||||
|
errorType.contains("Connect") || errorType.contains("Timeout")) {
|
||||||
|
return ErrorCategory.NETWORK;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Storage errors
|
||||||
|
if (errorType.contains("SQLite") || errorType.contains("Database") ||
|
||||||
|
errorType.contains("Storage") || errorType.contains("File")) {
|
||||||
|
return ErrorCategory.STORAGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Permission errors
|
||||||
|
if (errorType.contains("Security") || errorType.contains("Permission") ||
|
||||||
|
errorMessage != null && errorMessage.contains("permission")) {
|
||||||
|
return ErrorCategory.PERMISSION;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configuration errors
|
||||||
|
if (errorType.contains("IllegalArgument") || errorType.contains("Configuration") ||
|
||||||
|
errorMessage != null && errorMessage.contains("config")) {
|
||||||
|
return ErrorCategory.CONFIGURATION;
|
||||||
|
}
|
||||||
|
|
||||||
|
// System errors
|
||||||
|
if (errorType.contains("OutOfMemory") || errorType.contains("StackOverflow") ||
|
||||||
|
errorType.contains("Runtime")) {
|
||||||
|
return ErrorCategory.SYSTEM;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ErrorCategory.UNKNOWN;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine error code based on error details
|
||||||
|
*
|
||||||
|
* @param error Error to analyze
|
||||||
|
* @return Error code string
|
||||||
|
*/
|
||||||
|
private String determineErrorCode(Throwable error) {
|
||||||
|
String errorType = error.getClass().getSimpleName();
|
||||||
|
String errorMessage = error.getMessage();
|
||||||
|
|
||||||
|
// Generate error code based on type and message
|
||||||
|
if (errorMessage != null && errorMessage.length() > 0) {
|
||||||
|
return errorType + "_" + errorMessage.hashCode();
|
||||||
|
} else {
|
||||||
|
return errorType + "_" + System.currentTimeMillis();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine error severity based on error and category
|
||||||
|
*
|
||||||
|
* @param error Error to analyze
|
||||||
|
* @param category Error category
|
||||||
|
* @return ErrorSeverity
|
||||||
|
*/
|
||||||
|
private ErrorSeverity determineSeverity(Throwable error, ErrorCategory category) {
|
||||||
|
// Critical errors
|
||||||
|
if (error instanceof OutOfMemoryError || error instanceof StackOverflowError) {
|
||||||
|
return ErrorSeverity.CRITICAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// High severity errors
|
||||||
|
if (category == ErrorCategory.SYSTEM || category == ErrorCategory.STORAGE) {
|
||||||
|
return ErrorSeverity.HIGH;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Medium severity errors
|
||||||
|
if (category == ErrorCategory.NETWORK || category == ErrorCategory.PERMISSION) {
|
||||||
|
return ErrorSeverity.MEDIUM;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Low severity errors
|
||||||
|
return ErrorSeverity.LOW;
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Retry Logic
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if error should be retried
|
||||||
|
*
|
||||||
|
* @param operationId Operation identifier
|
||||||
|
* @param errorInfo Error information
|
||||||
|
* @return true if should retry
|
||||||
|
*/
|
||||||
|
private boolean shouldRetry(String operationId, ErrorInfo errorInfo) {
|
||||||
|
return shouldRetry(operationId, errorInfo, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if error should be retried with custom config
|
||||||
|
*
|
||||||
|
* @param operationId Operation identifier
|
||||||
|
* @param errorInfo Error information
|
||||||
|
* @param retryConfig Custom retry configuration
|
||||||
|
* @return true if should retry
|
||||||
|
*/
|
||||||
|
private boolean shouldRetry(String operationId, ErrorInfo errorInfo, RetryConfiguration retryConfig) {
|
||||||
|
try {
|
||||||
|
// Get retry state
|
||||||
|
RetryState state = retryStates.get(operationId);
|
||||||
|
if (state == null) {
|
||||||
|
state = new RetryState();
|
||||||
|
retryStates.put(operationId, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check retry limits
|
||||||
|
int maxRetries = retryConfig != null ? retryConfig.maxRetries : config.maxRetries;
|
||||||
|
if (state.attemptCount >= maxRetries) {
|
||||||
|
Log.d(TAG, "Max retries exceeded for operation: " + operationId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if error is retryable based on category
|
||||||
|
boolean isRetryable = isErrorRetryable(errorInfo.category);
|
||||||
|
|
||||||
|
Log.d(TAG, "Should retry: " + isRetryable + " (attempt: " + state.attemptCount + "/" + maxRetries + ")");
|
||||||
|
return isRetryable;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking retry eligibility", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if error category is retryable
|
||||||
|
*
|
||||||
|
* @param category Error category
|
||||||
|
* @return true if retryable
|
||||||
|
*/
|
||||||
|
private boolean isErrorRetryable(ErrorCategory category) {
|
||||||
|
switch (category) {
|
||||||
|
case NETWORK:
|
||||||
|
case STORAGE:
|
||||||
|
return true;
|
||||||
|
case PERMISSION:
|
||||||
|
case CONFIGURATION:
|
||||||
|
case SYSTEM:
|
||||||
|
case UNKNOWN:
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle retryable error
|
||||||
|
*
|
||||||
|
* @param operationId Operation identifier
|
||||||
|
* @param errorInfo Error information
|
||||||
|
* @return ErrorResult with retry information
|
||||||
|
*/
|
||||||
|
private ErrorResult handleRetryableError(String operationId, ErrorInfo errorInfo) {
|
||||||
|
return handleRetryableError(operationId, errorInfo, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle retryable error with custom config
|
||||||
|
*
|
||||||
|
* @param operationId Operation identifier
|
||||||
|
* @param errorInfo Error information
|
||||||
|
* @param retryConfig Custom retry configuration
|
||||||
|
* @return ErrorResult with retry information
|
||||||
|
*/
|
||||||
|
private ErrorResult handleRetryableError(String operationId, ErrorInfo errorInfo, RetryConfiguration retryConfig) {
|
||||||
|
try {
|
||||||
|
RetryState state = retryStates.get(operationId);
|
||||||
|
state.attemptCount++;
|
||||||
|
|
||||||
|
// Calculate delay with exponential backoff
|
||||||
|
long delay = calculateRetryDelay(state.attemptCount, retryConfig);
|
||||||
|
state.nextRetryTime = System.currentTimeMillis() + delay;
|
||||||
|
|
||||||
|
Log.i(TAG, "Retryable error handled - retry in " + delay + "ms (attempt " + state.attemptCount + ")");
|
||||||
|
|
||||||
|
return ErrorResult.retryable(errorInfo, delay, state.attemptCount);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling retryable error", e);
|
||||||
|
return ErrorResult.fatal("Retry handling failure: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle non-retryable error
|
||||||
|
*
|
||||||
|
* @param operationId Operation identifier
|
||||||
|
* @param errorInfo Error information
|
||||||
|
* @return ErrorResult with failure information
|
||||||
|
*/
|
||||||
|
private ErrorResult handleNonRetryableError(String operationId, ErrorInfo errorInfo) {
|
||||||
|
try {
|
||||||
|
Log.w(TAG, "Non-retryable error handled for operation: " + operationId);
|
||||||
|
|
||||||
|
// Clean up retry state
|
||||||
|
retryStates.remove(operationId);
|
||||||
|
|
||||||
|
return ErrorResult.fatal(errorInfo);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling non-retryable error", e);
|
||||||
|
return ErrorResult.fatal("Non-retryable error handling failure: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate retry delay with exponential backoff
|
||||||
|
*
|
||||||
|
* @param attemptCount Current attempt number
|
||||||
|
* @param retryConfig Custom retry configuration
|
||||||
|
* @return Delay in milliseconds
|
||||||
|
*/
|
||||||
|
private long calculateRetryDelay(int attemptCount, RetryConfiguration retryConfig) {
|
||||||
|
try {
|
||||||
|
long baseDelay = retryConfig != null ? retryConfig.baseDelayMs : config.baseDelayMs;
|
||||||
|
double multiplier = retryConfig != null ? retryConfig.backoffMultiplier : config.backoffMultiplier;
|
||||||
|
long maxDelay = retryConfig != null ? retryConfig.maxDelayMs : config.maxDelayMs;
|
||||||
|
|
||||||
|
// Calculate exponential backoff: baseDelay * (multiplier ^ (attemptCount - 1))
|
||||||
|
long delay = (long) (baseDelay * Math.pow(multiplier, attemptCount - 1));
|
||||||
|
|
||||||
|
// Cap at maximum delay
|
||||||
|
delay = Math.min(delay, maxDelay);
|
||||||
|
|
||||||
|
// Add jitter to prevent thundering herd
|
||||||
|
long jitter = (long) (delay * 0.1 * Math.random());
|
||||||
|
delay += jitter;
|
||||||
|
|
||||||
|
Log.d(TAG, "Calculated retry delay: " + delay + "ms (attempt " + attemptCount + ")");
|
||||||
|
return delay;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error calculating retry delay", e);
|
||||||
|
return config.baseDelayMs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Metrics and Telemetry
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get error metrics
|
||||||
|
*
|
||||||
|
* @return ErrorMetrics with current statistics
|
||||||
|
*/
|
||||||
|
public ErrorMetrics getMetrics() {
|
||||||
|
return metrics;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reset error metrics
|
||||||
|
*/
|
||||||
|
public void resetMetrics() {
|
||||||
|
metrics.reset();
|
||||||
|
Log.d(TAG, "Error metrics reset");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get retry statistics
|
||||||
|
*
|
||||||
|
* @return RetryStatistics with retry information
|
||||||
|
*/
|
||||||
|
public RetryStatistics getRetryStatistics() {
|
||||||
|
int totalOperations = retryStates.size();
|
||||||
|
int activeRetries = 0;
|
||||||
|
int totalRetries = 0;
|
||||||
|
|
||||||
|
for (RetryState state : retryStates.values()) {
|
||||||
|
if (state.attemptCount > 0) {
|
||||||
|
activeRetries++;
|
||||||
|
totalRetries += state.attemptCount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new RetryStatistics(totalOperations, activeRetries, totalRetries);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear retry states
|
||||||
|
*/
|
||||||
|
public void clearRetryStates() {
|
||||||
|
retryStates.clear();
|
||||||
|
Log.d(TAG, "Retry states cleared");
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Data Classes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error information
|
||||||
|
*/
|
||||||
|
public static class ErrorInfo {
|
||||||
|
public final Throwable error;
|
||||||
|
public final ErrorCategory category;
|
||||||
|
public final String errorCode;
|
||||||
|
public final ErrorSeverity severity;
|
||||||
|
public final long timestamp;
|
||||||
|
|
||||||
|
public ErrorInfo(Throwable error, ErrorCategory category, String errorCode, ErrorSeverity severity, long timestamp) {
|
||||||
|
this.error = error;
|
||||||
|
this.category = category;
|
||||||
|
this.errorCode = errorCode;
|
||||||
|
this.severity = severity;
|
||||||
|
this.timestamp = timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("ErrorInfo{category=%s, code=%s, severity=%s, error=%s}",
|
||||||
|
category, errorCode, severity, error.getClass().getSimpleName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retry state for an operation
|
||||||
|
*/
|
||||||
|
private static class RetryState {
|
||||||
|
public int attemptCount = 0;
|
||||||
|
public long nextRetryTime = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error result
|
||||||
|
*/
|
||||||
|
public static class ErrorResult {
|
||||||
|
public final boolean success;
|
||||||
|
public final boolean retryable;
|
||||||
|
public final ErrorInfo errorInfo;
|
||||||
|
public final long retryDelayMs;
|
||||||
|
public final int attemptCount;
|
||||||
|
public final String message;
|
||||||
|
|
||||||
|
private ErrorResult(boolean success, boolean retryable, ErrorInfo errorInfo, long retryDelayMs, int attemptCount, String message) {
|
||||||
|
this.success = success;
|
||||||
|
this.retryable = retryable;
|
||||||
|
this.errorInfo = errorInfo;
|
||||||
|
this.retryDelayMs = retryDelayMs;
|
||||||
|
this.attemptCount = attemptCount;
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ErrorResult retryable(ErrorInfo errorInfo, long retryDelayMs, int attemptCount) {
|
||||||
|
return new ErrorResult(false, true, errorInfo, retryDelayMs, attemptCount, "Retryable error");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ErrorResult fatal(ErrorInfo errorInfo) {
|
||||||
|
return new ErrorResult(false, false, errorInfo, 0, 0, "Fatal error");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ErrorResult fatal(String message) {
|
||||||
|
return new ErrorResult(false, false, null, 0, 0, message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error configuration
|
||||||
|
*/
|
||||||
|
public static class ErrorConfiguration {
|
||||||
|
public final int maxRetries;
|
||||||
|
public final long baseDelayMs;
|
||||||
|
public final long maxDelayMs;
|
||||||
|
public final double backoffMultiplier;
|
||||||
|
|
||||||
|
public ErrorConfiguration() {
|
||||||
|
this(DEFAULT_MAX_RETRIES, DEFAULT_BASE_DELAY_MS, DEFAULT_MAX_DELAY_MS, DEFAULT_BACKOFF_MULTIPLIER);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ErrorConfiguration(int maxRetries, long baseDelayMs, long maxDelayMs, double backoffMultiplier) {
|
||||||
|
this.maxRetries = maxRetries;
|
||||||
|
this.baseDelayMs = baseDelayMs;
|
||||||
|
this.maxDelayMs = maxDelayMs;
|
||||||
|
this.backoffMultiplier = backoffMultiplier;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retry configuration
|
||||||
|
*/
|
||||||
|
public static class RetryConfiguration {
|
||||||
|
public final int maxRetries;
|
||||||
|
public final long baseDelayMs;
|
||||||
|
public final long maxDelayMs;
|
||||||
|
public final double backoffMultiplier;
|
||||||
|
|
||||||
|
public RetryConfiguration(int maxRetries, long baseDelayMs, long maxDelayMs, double backoffMultiplier) {
|
||||||
|
this.maxRetries = maxRetries;
|
||||||
|
this.baseDelayMs = baseDelayMs;
|
||||||
|
this.maxDelayMs = maxDelayMs;
|
||||||
|
this.backoffMultiplier = backoffMultiplier;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error metrics
|
||||||
|
*/
|
||||||
|
public static class ErrorMetrics {
|
||||||
|
private final AtomicInteger totalErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger networkErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger storageErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger schedulingErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger permissionErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger configurationErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger systemErrors = new AtomicInteger(0);
|
||||||
|
private final AtomicInteger unknownErrors = new AtomicInteger(0);
|
||||||
|
|
||||||
|
public void recordError(ErrorInfo errorInfo) {
|
||||||
|
totalErrors.incrementAndGet();
|
||||||
|
|
||||||
|
switch (errorInfo.category) {
|
||||||
|
case NETWORK:
|
||||||
|
networkErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
case STORAGE:
|
||||||
|
storageErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
case SCHEDULING:
|
||||||
|
schedulingErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
case PERMISSION:
|
||||||
|
permissionErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
case CONFIGURATION:
|
||||||
|
configurationErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
case SYSTEM:
|
||||||
|
systemErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
case UNKNOWN:
|
||||||
|
default:
|
||||||
|
unknownErrors.incrementAndGet();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void reset() {
|
||||||
|
totalErrors.set(0);
|
||||||
|
networkErrors.set(0);
|
||||||
|
storageErrors.set(0);
|
||||||
|
schedulingErrors.set(0);
|
||||||
|
permissionErrors.set(0);
|
||||||
|
configurationErrors.set(0);
|
||||||
|
systemErrors.set(0);
|
||||||
|
unknownErrors.set(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getTotalErrors() { return totalErrors.get(); }
|
||||||
|
public int getNetworkErrors() { return networkErrors.get(); }
|
||||||
|
public int getStorageErrors() { return storageErrors.get(); }
|
||||||
|
public int getSchedulingErrors() { return schedulingErrors.get(); }
|
||||||
|
public int getPermissionErrors() { return permissionErrors.get(); }
|
||||||
|
public int getConfigurationErrors() { return configurationErrors.get(); }
|
||||||
|
public int getSystemErrors() { return systemErrors.get(); }
|
||||||
|
public int getUnknownErrors() { return unknownErrors.get(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retry statistics
|
||||||
|
*/
|
||||||
|
public static class RetryStatistics {
|
||||||
|
public final int totalOperations;
|
||||||
|
public final int activeRetries;
|
||||||
|
public final int totalRetries;
|
||||||
|
|
||||||
|
public RetryStatistics(int totalOperations, int activeRetries, int totalRetries) {
|
||||||
|
this.totalOperations = totalOperations;
|
||||||
|
this.activeRetries = activeRetries;
|
||||||
|
this.totalRetries = totalRetries;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("RetryStatistics{totalOps=%d, activeRetries=%d, totalRetries=%d}",
|
||||||
|
totalOperations, activeRetries, totalRetries);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
384
src/android/DailyNotificationExactAlarmManager.java
Normal file
384
src/android/DailyNotificationExactAlarmManager.java
Normal file
@@ -0,0 +1,384 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationExactAlarmManager.java
|
||||||
|
*
|
||||||
|
* Android Exact Alarm Manager with fallback to windowed alarms
|
||||||
|
* Implements SCHEDULE_EXACT_ALARM permission handling and fallback logic
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.app.AlarmManager;
|
||||||
|
import android.app.PendingIntent;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages Android exact alarms with fallback to windowed alarms
|
||||||
|
*
|
||||||
|
* This class implements the critical Android alarm management:
|
||||||
|
* - Requests SCHEDULE_EXACT_ALARM permission
|
||||||
|
* - Falls back to windowed alarms (±10m) if exact permission denied
|
||||||
|
* - Provides deep-link to enable exact alarms in settings
|
||||||
|
* - Handles reboot and time-change recovery
|
||||||
|
*/
|
||||||
|
public class DailyNotificationExactAlarmManager {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationExactAlarmManager";
|
||||||
|
|
||||||
|
// Permission constants
|
||||||
|
private static final String PERMISSION_SCHEDULE_EXACT_ALARM = "android.permission.SCHEDULE_EXACT_ALARM";
|
||||||
|
|
||||||
|
// Fallback window settings
|
||||||
|
private static final long FALLBACK_WINDOW_START_MS = TimeUnit.MINUTES.toMillis(-10); // 10 minutes before
|
||||||
|
private static final long FALLBACK_WINDOW_LENGTH_MS = TimeUnit.MINUTES.toMillis(20); // 20 minutes total
|
||||||
|
|
||||||
|
// Deep-link constants
|
||||||
|
private static final String EXACT_ALARM_SETTINGS_ACTION = "android.settings.REQUEST_SCHEDULE_EXACT_ALARM";
|
||||||
|
private static final String EXACT_ALARM_SETTINGS_PACKAGE = "com.android.settings";
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final AlarmManager alarmManager;
|
||||||
|
private final DailyNotificationScheduler scheduler;
|
||||||
|
|
||||||
|
// Alarm state
|
||||||
|
private boolean exactAlarmsEnabled = false;
|
||||||
|
private boolean exactAlarmsSupported = false;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param alarmManager System AlarmManager service
|
||||||
|
* @param scheduler Notification scheduler
|
||||||
|
*/
|
||||||
|
public DailyNotificationExactAlarmManager(Context context, AlarmManager alarmManager, DailyNotificationScheduler scheduler) {
|
||||||
|
this.context = context;
|
||||||
|
this.alarmManager = alarmManager;
|
||||||
|
this.scheduler = scheduler;
|
||||||
|
|
||||||
|
// Check exact alarm support and status
|
||||||
|
checkExactAlarmSupport();
|
||||||
|
checkExactAlarmStatus();
|
||||||
|
|
||||||
|
Log.d(TAG, "ExactAlarmManager initialized: supported=" + exactAlarmsSupported + ", enabled=" + exactAlarmsEnabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Exact Alarm Support
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if exact alarms are supported on this device
|
||||||
|
*/
|
||||||
|
private void checkExactAlarmSupport() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
exactAlarmsSupported = true;
|
||||||
|
Log.d(TAG, "Exact alarms supported on Android S+");
|
||||||
|
} else {
|
||||||
|
exactAlarmsSupported = false;
|
||||||
|
Log.d(TAG, "Exact alarms not supported on Android " + Build.VERSION.SDK_INT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check current exact alarm status
|
||||||
|
*/
|
||||||
|
private void checkExactAlarmStatus() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
exactAlarmsEnabled = alarmManager.canScheduleExactAlarms();
|
||||||
|
Log.d(TAG, "Exact alarm status: " + (exactAlarmsEnabled ? "enabled" : "disabled"));
|
||||||
|
} else {
|
||||||
|
exactAlarmsEnabled = true; // Always available on older Android versions
|
||||||
|
Log.d(TAG, "Exact alarms always available on Android " + Build.VERSION.SDK_INT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get exact alarm status
|
||||||
|
*
|
||||||
|
* @return Status information
|
||||||
|
*/
|
||||||
|
public ExactAlarmStatus getExactAlarmStatus() {
|
||||||
|
return new ExactAlarmStatus(
|
||||||
|
exactAlarmsSupported,
|
||||||
|
exactAlarmsEnabled,
|
||||||
|
canScheduleExactAlarms(),
|
||||||
|
getFallbackWindowInfo()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if exact alarms can be scheduled
|
||||||
|
*
|
||||||
|
* @return true if exact alarms can be scheduled
|
||||||
|
*/
|
||||||
|
public boolean canScheduleExactAlarms() {
|
||||||
|
if (!exactAlarmsSupported) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
return alarmManager.canScheduleExactAlarms();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fallback window information
|
||||||
|
*
|
||||||
|
* @return Fallback window info
|
||||||
|
*/
|
||||||
|
public FallbackWindowInfo getFallbackWindowInfo() {
|
||||||
|
return new FallbackWindowInfo(
|
||||||
|
FALLBACK_WINDOW_START_MS,
|
||||||
|
FALLBACK_WINDOW_LENGTH_MS,
|
||||||
|
"±10 minutes"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Alarm Scheduling
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule alarm with exact or fallback logic
|
||||||
|
*
|
||||||
|
* @param pendingIntent PendingIntent to trigger
|
||||||
|
* @param triggerTime Exact trigger time
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
public boolean scheduleAlarm(PendingIntent pendingIntent, long triggerTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling alarm for " + triggerTime);
|
||||||
|
|
||||||
|
if (canScheduleExactAlarms()) {
|
||||||
|
return scheduleExactAlarm(pendingIntent, triggerTime);
|
||||||
|
} else {
|
||||||
|
return scheduleWindowedAlarm(pendingIntent, triggerTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling alarm", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule exact alarm
|
||||||
|
*
|
||||||
|
* @param pendingIntent PendingIntent to trigger
|
||||||
|
* @param triggerTime Exact trigger time
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
private boolean scheduleExactAlarm(PendingIntent pendingIntent, long triggerTime) {
|
||||||
|
try {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
|
alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
|
||||||
|
Log.i(TAG, "Exact alarm scheduled for " + triggerTime);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
alarmManager.setExact(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
|
||||||
|
Log.i(TAG, "Exact alarm scheduled for " + triggerTime + " (pre-M)");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling exact alarm", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule windowed alarm as fallback
|
||||||
|
*
|
||||||
|
* @param pendingIntent PendingIntent to trigger
|
||||||
|
* @param triggerTime Target trigger time
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
private boolean scheduleWindowedAlarm(PendingIntent pendingIntent, long triggerTime) {
|
||||||
|
try {
|
||||||
|
// Calculate window start time (10 minutes before target)
|
||||||
|
long windowStartTime = triggerTime + FALLBACK_WINDOW_START_MS;
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
||||||
|
alarmManager.setWindow(AlarmManager.RTC_WAKEUP, windowStartTime, FALLBACK_WINDOW_LENGTH_MS, pendingIntent);
|
||||||
|
Log.i(TAG, "Windowed alarm scheduled: target=" + triggerTime + ", window=" + windowStartTime + " to " + (windowStartTime + FALLBACK_WINDOW_LENGTH_MS));
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
// Fallback to inexact alarm on older versions
|
||||||
|
alarmManager.set(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
|
||||||
|
Log.i(TAG, "Inexact alarm scheduled for " + triggerTime + " (pre-KitKat)");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling windowed alarm", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Permission Management
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Request exact alarm permission
|
||||||
|
*
|
||||||
|
* @return true if permission request was initiated
|
||||||
|
*/
|
||||||
|
public boolean requestExactAlarmPermission() {
|
||||||
|
if (!exactAlarmsSupported) {
|
||||||
|
Log.w(TAG, "Exact alarms not supported on this device");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (exactAlarmsEnabled) {
|
||||||
|
Log.d(TAG, "Exact alarms already enabled");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Open exact alarm settings
|
||||||
|
Intent intent = new Intent(EXACT_ALARM_SETTINGS_ACTION);
|
||||||
|
intent.setPackage(EXACT_ALARM_SETTINGS_PACKAGE);
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
|
||||||
|
context.startActivity(intent);
|
||||||
|
Log.i(TAG, "Exact alarm permission request initiated");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error requesting exact alarm permission", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open exact alarm settings
|
||||||
|
*
|
||||||
|
* @return true if settings were opened
|
||||||
|
*/
|
||||||
|
public boolean openExactAlarmSettings() {
|
||||||
|
try {
|
||||||
|
Intent intent = new Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM);
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
|
||||||
|
context.startActivity(intent);
|
||||||
|
Log.i(TAG, "Exact alarm settings opened");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error opening exact alarm settings", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if exact alarm permission is granted
|
||||||
|
*
|
||||||
|
* @return true if permission is granted
|
||||||
|
*/
|
||||||
|
public boolean hasExactAlarmPermission() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
return context.checkSelfPermission(PERMISSION_SCHEDULE_EXACT_ALARM) == PackageManager.PERMISSION_GRANTED;
|
||||||
|
}
|
||||||
|
return true; // Always available on older versions
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Reboot and Time Change Recovery
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle system reboot
|
||||||
|
*
|
||||||
|
* This method should be called when the system boots to restore
|
||||||
|
* scheduled alarms that were lost during reboot.
|
||||||
|
*/
|
||||||
|
public void handleSystemReboot() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Handling system reboot - restoring scheduled alarms");
|
||||||
|
|
||||||
|
// Re-schedule all pending notifications
|
||||||
|
scheduler.restoreScheduledNotifications();
|
||||||
|
|
||||||
|
Log.i(TAG, "System reboot handling completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling system reboot", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle time change
|
||||||
|
*
|
||||||
|
* This method should be called when the system time changes
|
||||||
|
* to adjust scheduled alarms accordingly.
|
||||||
|
*/
|
||||||
|
public void handleTimeChange() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Handling time change - adjusting scheduled alarms");
|
||||||
|
|
||||||
|
// Re-schedule all pending notifications with adjusted times
|
||||||
|
scheduler.adjustScheduledNotifications();
|
||||||
|
|
||||||
|
Log.i(TAG, "Time change handling completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling time change", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Status Classes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exact alarm status information
|
||||||
|
*/
|
||||||
|
public static class ExactAlarmStatus {
|
||||||
|
public final boolean supported;
|
||||||
|
public final boolean enabled;
|
||||||
|
public final boolean canSchedule;
|
||||||
|
public final FallbackWindowInfo fallbackWindow;
|
||||||
|
|
||||||
|
public ExactAlarmStatus(boolean supported, boolean enabled, boolean canSchedule, FallbackWindowInfo fallbackWindow) {
|
||||||
|
this.supported = supported;
|
||||||
|
this.enabled = enabled;
|
||||||
|
this.canSchedule = canSchedule;
|
||||||
|
this.fallbackWindow = fallbackWindow;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("ExactAlarmStatus{supported=%s, enabled=%s, canSchedule=%s, fallbackWindow=%s}",
|
||||||
|
supported, enabled, canSchedule, fallbackWindow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fallback window information
|
||||||
|
*/
|
||||||
|
public static class FallbackWindowInfo {
|
||||||
|
public final long startMs;
|
||||||
|
public final long lengthMs;
|
||||||
|
public final String description;
|
||||||
|
|
||||||
|
public FallbackWindowInfo(long startMs, long lengthMs, String description) {
|
||||||
|
this.startMs = startMs;
|
||||||
|
this.lengthMs = lengthMs;
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("FallbackWindowInfo{start=%dms, length=%dms, description='%s'}",
|
||||||
|
startMs, lengthMs, description);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
639
src/android/DailyNotificationFetchWorker.java
Normal file
639
src/android/DailyNotificationFetchWorker.java
Normal file
@@ -0,0 +1,639 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationFetchWorker.java
|
||||||
|
*
|
||||||
|
* WorkManager worker for background content fetching
|
||||||
|
* Implements the prefetch step with timeout handling and retry logic
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.work.Data;
|
||||||
|
import androidx.work.Worker;
|
||||||
|
import androidx.work.WorkerParameters;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Background worker for fetching daily notification content
|
||||||
|
*
|
||||||
|
* This worker implements the prefetch step of the offline-first pipeline.
|
||||||
|
* It runs in the background to fetch content before it's needed,
|
||||||
|
* with proper timeout handling and retry mechanisms.
|
||||||
|
*/
|
||||||
|
public class DailyNotificationFetchWorker extends Worker {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationFetchWorker";
|
||||||
|
private static final String KEY_SCHEDULED_TIME = "scheduled_time";
|
||||||
|
private static final String KEY_FETCH_TIME = "fetch_time";
|
||||||
|
private static final String KEY_RETRY_COUNT = "retry_count";
|
||||||
|
private static final String KEY_IMMEDIATE = "immediate";
|
||||||
|
|
||||||
|
private static final int MAX_RETRY_ATTEMPTS = 3;
|
||||||
|
private static final long WORK_TIMEOUT_MS = 8 * 60 * 1000; // 8 minutes total
|
||||||
|
private static final long FETCH_TIMEOUT_MS = 30 * 1000; // 30 seconds for fetch
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationStorage storage;
|
||||||
|
private final DailyNotificationFetcher fetcher;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param params Worker parameters
|
||||||
|
*/
|
||||||
|
public DailyNotificationFetchWorker(@NonNull Context context,
|
||||||
|
@NonNull WorkerParameters params) {
|
||||||
|
super(context, params);
|
||||||
|
this.context = context;
|
||||||
|
this.storage = new DailyNotificationStorage(context);
|
||||||
|
this.fetcher = new DailyNotificationFetcher(context, storage);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Main work method - fetch content with timeout and retry logic
|
||||||
|
*
|
||||||
|
* @return Result indicating success, failure, or retry
|
||||||
|
*/
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public Result doWork() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Starting background content fetch");
|
||||||
|
|
||||||
|
// Get input data
|
||||||
|
Data inputData = getInputData();
|
||||||
|
long scheduledTime = inputData.getLong(KEY_SCHEDULED_TIME, 0);
|
||||||
|
long fetchTime = inputData.getLong(KEY_FETCH_TIME, 0);
|
||||||
|
int retryCount = inputData.getInt(KEY_RETRY_COUNT, 0);
|
||||||
|
boolean immediate = inputData.getBoolean(KEY_IMMEDIATE, false);
|
||||||
|
|
||||||
|
// Phase 3: Extract TimeSafari coordination data
|
||||||
|
boolean timesafariCoordination = inputData.getBoolean("timesafari_coordination", false);
|
||||||
|
long coordinationTimestamp = inputData.getLong("coordination_timestamp", 0);
|
||||||
|
String activeDidTracking = inputData.getString("active_did_tracking");
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("Phase 3: Fetch parameters - Scheduled: %d, Fetch: %d, Retry: %d, Immediate: %s",
|
||||||
|
scheduledTime, fetchTime, retryCount, immediate));
|
||||||
|
Log.d(TAG, String.format("Phase 3: TimeSafari coordination - Enabled: %s, Timestamp: %d, Tracking: %s",
|
||||||
|
timesafariCoordination, coordinationTimestamp, activeDidTracking));
|
||||||
|
|
||||||
|
// Phase 3: Check TimeSafari coordination constraints
|
||||||
|
if (timesafariCoordination && !shouldProceedWithTimeSafariCoordination(coordinationTimestamp)) {
|
||||||
|
Log.d(TAG, "Phase 3: Skipping fetch - TimeSafari coordination constraints not met");
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if we should proceed with fetch
|
||||||
|
if (!shouldProceedWithFetch(scheduledTime, fetchTime)) {
|
||||||
|
Log.d(TAG, "Skipping fetch - conditions not met");
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attempt to fetch content with timeout
|
||||||
|
NotificationContent content = fetchContentWithTimeout();
|
||||||
|
|
||||||
|
if (content != null) {
|
||||||
|
// Success - save content and schedule notification
|
||||||
|
handleSuccessfulFetch(content);
|
||||||
|
return Result.success();
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Fetch failed - handle retry logic
|
||||||
|
return handleFailedFetch(retryCount, scheduledTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Unexpected error during background fetch", e);
|
||||||
|
return handleFailedFetch(0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if we should proceed with the fetch
|
||||||
|
*
|
||||||
|
* @param scheduledTime When notification is scheduled for
|
||||||
|
* @param fetchTime When fetch was originally scheduled for
|
||||||
|
* @return true if fetch should proceed
|
||||||
|
*/
|
||||||
|
private boolean shouldProceedWithFetch(long scheduledTime, long fetchTime) {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
// If this is an immediate fetch, always proceed
|
||||||
|
if (fetchTime == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if fetch time has passed
|
||||||
|
if (currentTime < fetchTime) {
|
||||||
|
Log.d(TAG, "Fetch time not yet reached");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if notification time has passed
|
||||||
|
if (currentTime >= scheduledTime) {
|
||||||
|
Log.d(TAG, "Notification time has passed, fetch not needed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if we already have recent content
|
||||||
|
if (!storage.shouldFetchNewContent()) {
|
||||||
|
Log.d(TAG, "Recent content available, fetch not needed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch content with timeout handling
|
||||||
|
*
|
||||||
|
* @return Fetched content or null if failed
|
||||||
|
*/
|
||||||
|
private NotificationContent fetchContentWithTimeout() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Fetching content with timeout: " + FETCH_TIMEOUT_MS + "ms");
|
||||||
|
|
||||||
|
// Use a simple timeout mechanism
|
||||||
|
// In production, you might use CompletableFuture with timeout
|
||||||
|
long startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
// Attempt fetch
|
||||||
|
NotificationContent content = fetcher.fetchContentImmediately();
|
||||||
|
|
||||||
|
long fetchDuration = System.currentTimeMillis() - startTime;
|
||||||
|
|
||||||
|
if (content != null) {
|
||||||
|
Log.d(TAG, "Content fetched successfully in " + fetchDuration + "ms");
|
||||||
|
return content;
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Content fetch returned null after " + fetchDuration + "ms");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during content fetch", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle successful content fetch
|
||||||
|
*
|
||||||
|
* @param content Successfully fetched content
|
||||||
|
*/
|
||||||
|
private void handleSuccessfulFetch(NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Handling successful content fetch: " + content.getId());
|
||||||
|
|
||||||
|
// Content is already saved by the fetcher
|
||||||
|
// Update last fetch time
|
||||||
|
storage.setLastFetchTime(System.currentTimeMillis());
|
||||||
|
|
||||||
|
// Schedule notification if not already scheduled
|
||||||
|
scheduleNotificationIfNeeded(content);
|
||||||
|
|
||||||
|
Log.i(TAG, "Successful fetch handling completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling successful fetch", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle failed content fetch with retry logic
|
||||||
|
*
|
||||||
|
* @param retryCount Current retry attempt
|
||||||
|
* @param scheduledTime When notification is scheduled for
|
||||||
|
* @return Result indicating retry or failure
|
||||||
|
*/
|
||||||
|
private Result handleFailedFetch(int retryCount, long scheduledTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 2: Handling failed fetch - Retry: " + retryCount);
|
||||||
|
|
||||||
|
// Phase 2: Check for TimeSafari special retry triggers
|
||||||
|
if (shouldRetryForActiveDidChange()) {
|
||||||
|
Log.d(TAG, "Phase 2: ActiveDid change detected - extending retry quota");
|
||||||
|
retryCount = 0; // Reset retry count for activeDid change
|
||||||
|
}
|
||||||
|
|
||||||
|
if (retryCount < MAX_RETRIES_FOR_TIMESAFARI()) {
|
||||||
|
// Phase 2: Schedule enhanced retry with activeDid consideration
|
||||||
|
scheduleRetryWithActiveDidSupport(retryCount + 1, scheduledTime);
|
||||||
|
Log.i(TAG, "Phase 2: Scheduled retry attempt " + (retryCount + 1) + " with TimeSafari support");
|
||||||
|
return Result.retry();
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Max retries reached - use fallback content
|
||||||
|
Log.w(TAG, "Phase 2: Max retries reached, using fallback content");
|
||||||
|
useFallbackContentWithActiveDidSupport(scheduledTime);
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 2: Error handling failed fetch", e);
|
||||||
|
return Result.failure();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule a retry attempt
|
||||||
|
*
|
||||||
|
* @param retryCount New retry attempt number
|
||||||
|
* @param scheduledTime When notification is scheduled for
|
||||||
|
*/
|
||||||
|
private void scheduleRetry(int retryCount, long scheduledTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling retry attempt " + retryCount);
|
||||||
|
|
||||||
|
// Calculate retry delay with exponential backoff
|
||||||
|
long retryDelay = calculateRetryDelay(retryCount);
|
||||||
|
|
||||||
|
// Create retry work request
|
||||||
|
Data retryData = new Data.Builder()
|
||||||
|
.putLong(KEY_SCHEDULED_TIME, scheduledTime)
|
||||||
|
.putLong(KEY_FETCH_TIME, System.currentTimeMillis())
|
||||||
|
.putInt(KEY_RETRY_COUNT, retryCount)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
androidx.work.OneTimeWorkRequest retryWork =
|
||||||
|
new androidx.work.OneTimeWorkRequest.Builder(DailyNotificationFetchWorker.class)
|
||||||
|
.setInputData(retryData)
|
||||||
|
.setInitialDelay(retryDelay, TimeUnit.MILLISECONDS)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
androidx.work.WorkManager.getInstance(context).enqueue(retryWork);
|
||||||
|
|
||||||
|
Log.d(TAG, "Retry scheduled for " + retryDelay + "ms from now");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling retry", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate retry delay with exponential backoff
|
||||||
|
*
|
||||||
|
* @param retryCount Current retry attempt
|
||||||
|
* @return Delay in milliseconds
|
||||||
|
*/
|
||||||
|
private long calculateRetryDelay(int retryCount) {
|
||||||
|
// Base delay: 1 minute, exponential backoff: 2^retryCount
|
||||||
|
long baseDelay = 60 * 1000; // 1 minute
|
||||||
|
long exponentialDelay = baseDelay * (long) Math.pow(2, retryCount - 1);
|
||||||
|
|
||||||
|
// Cap at 1 hour
|
||||||
|
long maxDelay = 60 * 60 * 1000; // 1 hour
|
||||||
|
return Math.min(exponentialDelay, maxDelay);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Phase 2: TimeSafari ActiveDid Enhancement Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 2: Check if retry is needed due to activeDid change
|
||||||
|
*/
|
||||||
|
private boolean shouldRetryForActiveDidChange() {
|
||||||
|
try {
|
||||||
|
// Check if activeDid has changed since last fetch attempt
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences("daily_notification_timesafari", android.content.Context.MODE_PRIVATE);
|
||||||
|
long lastFetchAttempt = prefs.getLong("lastFetchAttempt", 0);
|
||||||
|
long lastActiveDidChange = prefs.getLong("lastActiveDidChange", 0);
|
||||||
|
|
||||||
|
boolean activeDidChanged = lastActiveDidChange > lastFetchAttempt;
|
||||||
|
|
||||||
|
if (activeDidChanged) {
|
||||||
|
Log.d(TAG, "Phase 2: ActiveDid change detected in retry logic");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 2: Error checking activeDid change", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 2: Get max retries with TimeSafari enhancements
|
||||||
|
*/
|
||||||
|
private int MAX_RETRIES_FOR_TIMESAFARI() {
|
||||||
|
// Base retries + additional for activeDid changes
|
||||||
|
return MAX_RETRY_ATTEMPTS + 2; // Extra retries for TimeSafari integration
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 2: Schedule retry with activeDid support
|
||||||
|
*/
|
||||||
|
private void scheduleRetryWithActiveDidSupport(int retryCount, long scheduledTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 2: Scheduling retry attempt " + retryCount + " with TimeSafari support");
|
||||||
|
|
||||||
|
// Store the last fetch attempt time for activeDid change detection
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences("daily_notification_timesafari", android.content.Context.MODE_PRIVATE);
|
||||||
|
prefs.edit().putLong("lastFetchAttempt", System.currentTimeMillis()).apply();
|
||||||
|
|
||||||
|
// Delegate to original retry logic
|
||||||
|
scheduleRetry(retryCount, scheduledTime);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 2: Error scheduling enhanced retry", e);
|
||||||
|
// Fallback to original retry logic
|
||||||
|
scheduleRetry(retryCount, scheduledTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 2: Use fallback content with activeDid support
|
||||||
|
*/
|
||||||
|
private void useFallbackContentWithActiveDidSupport(long scheduledTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 2: Using fallback content with TimeSafari support");
|
||||||
|
|
||||||
|
// Generate TimeSafari-aware fallback content
|
||||||
|
NotificationContent fallbackContent = generateTimeSafariFallbackContent();
|
||||||
|
|
||||||
|
if (fallbackContent != null) {
|
||||||
|
storage.saveNotificationContent(fallbackContent);
|
||||||
|
Log.i(TAG, "Phase 2: TimeSafari fallback content saved");
|
||||||
|
} else {
|
||||||
|
// Fallback to original logic
|
||||||
|
useFallbackContent(scheduledTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 2: Error using enhanced fallback content", e);
|
||||||
|
// Fallback to original logic
|
||||||
|
useFallbackContent(scheduledTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 2: Generate TimeSafari-aware fallback content
|
||||||
|
*/
|
||||||
|
private NotificationContent generateTimeSafariFallbackContent() {
|
||||||
|
try {
|
||||||
|
// Generate fallback content specific to TimeSafari context
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.id = "timesafari_fallback_" + System.currentTimeMillis();
|
||||||
|
content.title = "TimeSafari Update Available";
|
||||||
|
content.body = "Your community updates are ready. Tap to view offers, projects, and connections.";
|
||||||
|
content.fetchTime = System.currentTimeMillis();
|
||||||
|
content.scheduledTime = System.currentTimeMillis() + 30000; // 30 seconds from now
|
||||||
|
|
||||||
|
return content;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 2: Error generating TimeSafari fallback content", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use fallback content when all retries fail
|
||||||
|
*
|
||||||
|
* @param scheduledTime When notification is scheduled for
|
||||||
|
*/
|
||||||
|
private void useFallbackContent(long scheduledTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Using fallback content for scheduled time: " + scheduledTime);
|
||||||
|
|
||||||
|
// Get fallback content from storage or create emergency content
|
||||||
|
NotificationContent fallbackContent = getFallbackContent(scheduledTime);
|
||||||
|
|
||||||
|
if (fallbackContent != null) {
|
||||||
|
// Save fallback content
|
||||||
|
storage.saveNotificationContent(fallbackContent);
|
||||||
|
|
||||||
|
// Schedule notification
|
||||||
|
scheduleNotificationIfNeeded(fallbackContent);
|
||||||
|
|
||||||
|
Log.i(TAG, "Fallback content applied successfully");
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Failed to get fallback content");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error using fallback content", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fallback content for the scheduled time
|
||||||
|
*
|
||||||
|
* @param scheduledTime When notification is scheduled for
|
||||||
|
* @return Fallback notification content
|
||||||
|
*/
|
||||||
|
private NotificationContent getFallbackContent(long scheduledTime) {
|
||||||
|
try {
|
||||||
|
// Try to get last known good content
|
||||||
|
NotificationContent lastContent = storage.getLastNotification();
|
||||||
|
|
||||||
|
if (lastContent != null && !lastContent.isStale()) {
|
||||||
|
Log.d(TAG, "Using last known good content as fallback");
|
||||||
|
|
||||||
|
// Create new content based on last good content
|
||||||
|
NotificationContent fallbackContent = new NotificationContent();
|
||||||
|
fallbackContent.setTitle(lastContent.getTitle());
|
||||||
|
fallbackContent.setBody(lastContent.getBody() + " (from " +
|
||||||
|
lastContent.getAgeString() + ")");
|
||||||
|
fallbackContent.setScheduledTime(scheduledTime);
|
||||||
|
fallbackContent.setSound(lastContent.isSound());
|
||||||
|
fallbackContent.setPriority(lastContent.getPriority());
|
||||||
|
fallbackContent.setUrl(lastContent.getUrl());
|
||||||
|
fallbackContent.setFetchTime(System.currentTimeMillis());
|
||||||
|
|
||||||
|
return fallbackContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create emergency fallback content
|
||||||
|
Log.w(TAG, "Creating emergency fallback content");
|
||||||
|
return createEmergencyFallbackContent(scheduledTime);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting fallback content", e);
|
||||||
|
return createEmergencyFallbackContent(scheduledTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create emergency fallback content
|
||||||
|
*
|
||||||
|
* @param scheduledTime When notification is scheduled for
|
||||||
|
* @return Emergency notification content
|
||||||
|
*/
|
||||||
|
private NotificationContent createEmergencyFallbackContent(long scheduledTime) {
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.setTitle("Daily Update");
|
||||||
|
content.setBody("🌅 Good morning! Ready to make today amazing?");
|
||||||
|
content.setScheduledTime(scheduledTime);
|
||||||
|
content.setFetchTime(System.currentTimeMillis());
|
||||||
|
content.setPriority("default");
|
||||||
|
content.setSound(true);
|
||||||
|
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule notification if not already scheduled
|
||||||
|
*
|
||||||
|
* @param content Notification content to schedule
|
||||||
|
*/
|
||||||
|
private void scheduleNotificationIfNeeded(NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Checking if notification needs scheduling: " + content.getId());
|
||||||
|
|
||||||
|
// Check if notification is already scheduled
|
||||||
|
DailyNotificationScheduler scheduler = new DailyNotificationScheduler(
|
||||||
|
context,
|
||||||
|
(android.app.AlarmManager) context.getSystemService(Context.ALARM_SERVICE)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!scheduler.isNotificationScheduled(content.getId())) {
|
||||||
|
Log.d(TAG, "Scheduling notification: " + content.getId());
|
||||||
|
boolean scheduled = scheduler.scheduleNotification(content);
|
||||||
|
|
||||||
|
if (scheduled) {
|
||||||
|
Log.i(TAG, "Notification scheduled successfully");
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Failed to schedule notification");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Log.d(TAG, "Notification already scheduled: " + content.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking/scheduling notification", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Phase 3: TimeSafari Coordination Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if background work should proceed with TimeSafari coordination
|
||||||
|
*/
|
||||||
|
private boolean shouldProceedWithTimeSafariCoordination(long coordinationTimestamp) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Checking TimeSafari coordination constraints");
|
||||||
|
|
||||||
|
// Check coordination freshness - must be within 5 minutes
|
||||||
|
long maxCoordinationAge = 5 * 60 * 1000; // 5 minutes
|
||||||
|
long coordinationAge = System.currentTimeMillis() - coordinationTimestamp;
|
||||||
|
|
||||||
|
if (coordinationAge > maxCoordinationAge) {
|
||||||
|
Log.w(TAG, "Phase 3: Coordination data too old (" + coordinationAge + "ms) - allowing fetch");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if app coordination is proactively paused
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
boolean coordinationPaused = prefs.getBoolean("coordinationPaused", false);
|
||||||
|
long lastCoordinationPaused = prefs.getLong("lastCoordinationPaused", 0);
|
||||||
|
boolean recentlyPaused = (System.currentTimeMillis() - lastCoordinationPaused) < 30000; // 30 seconds
|
||||||
|
|
||||||
|
if (coordinationPaused && recentlyPaused) {
|
||||||
|
Log.d(TAG, "Phase 3: Coordination proactively paused by TimeSafari - deferring fetch");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if activeDid has changed since coordination
|
||||||
|
long lastActiveDidChange = prefs.getLong("lastActiveDidChange", 0);
|
||||||
|
if (lastActiveDidChange > coordinationTimestamp) {
|
||||||
|
Log.d(TAG, "Phase 3: ActiveDid changed after coordination - requiring re-coordination");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check battery optimization status
|
||||||
|
if (isDeviceInLowPowerMode()) {
|
||||||
|
Log.d(TAG, "Phase 3: Device in low power mode - deferring fetch");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: TimeSafari coordination constraints satisfied");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking TimeSafari coordination", e);
|
||||||
|
return true; // Default to allowing fetch on error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if device is in low power mode
|
||||||
|
*/
|
||||||
|
private boolean isDeviceInLowPowerMode() {
|
||||||
|
try {
|
||||||
|
android.os.PowerManager powerManager =
|
||||||
|
(android.os.PowerManager) context.getSystemService(Context.POWER_SERVICE);
|
||||||
|
|
||||||
|
if (powerManager !=_null) {
|
||||||
|
boolean isLowPowerMode = powerManager.isPowerSaveMode();
|
||||||
|
Log.d(TAG, "Phase 3: Device low power mode: " + isLowPowerMode);
|
||||||
|
return isLowPowerMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking low power mode", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Report coordination success to TimeSafari
|
||||||
|
*/
|
||||||
|
private void reportCoordinationSuccess(String operation, long durationMs, boolean authUsed, String activeDid) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Reporting coordination success: " + operation);
|
||||||
|
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
prefs.edit()
|
||||||
|
.putLong("lastCoordinationSuccess_" + operation, System.currentTimeMillis())
|
||||||
|
.putLong("lastCoordinationDuration_" + operation, durationMs)
|
||||||
|
.putBoolean("lastCoordinationUsed_" + operation, authUsed)
|
||||||
|
.putString("lastCoordinationActiveDid_" + operation, activeDid)
|
||||||
|
.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: Coordination success reported - " + operation + " in " + durationMs + "ms");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error reporting coordination success", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Report coordination failure to TimeSafari
|
||||||
|
*/
|
||||||
|
private void reportCoordinationFailed(String operation, String error, long durationMs, boolean authUsed) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Reporting coordination failure: " + operation + " - " + error);
|
||||||
|
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
prefs.edit()
|
||||||
|
.putLong("lastCoordinationFailure_" + operation, System.currentTimeMillis())
|
||||||
|
.putString("lastCoordinationError_" + operation, error)
|
||||||
|
.putLong("lastCoordinationFailureDuration_" + operation, durationMs)
|
||||||
|
.putBoolean("lastCoordinationFailedUsed_" + operation, authUsed)
|
||||||
|
.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: Coordination failure reported - " + operation);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error reporting coordination failure", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
423
src/android/DailyNotificationFetcher.java
Normal file
423
src/android/DailyNotificationFetcher.java
Normal file
@@ -0,0 +1,423 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationFetcher.java
|
||||||
|
*
|
||||||
|
* Handles background content fetching for daily notifications
|
||||||
|
* Implements the prefetch step of the prefetch → cache → schedule → display pipeline
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.work.Data;
|
||||||
|
import androidx.work.OneTimeWorkRequest;
|
||||||
|
import androidx.work.WorkManager;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages background content fetching for daily notifications
|
||||||
|
*
|
||||||
|
* This class implements the prefetch step of the offline-first pipeline.
|
||||||
|
* It schedules background work to fetch content before it's needed,
|
||||||
|
* with proper timeout handling and fallback mechanisms.
|
||||||
|
*/
|
||||||
|
public class DailyNotificationFetcher {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationFetcher";
|
||||||
|
private static final String WORK_TAG_FETCH = "daily_notification_fetch";
|
||||||
|
private static final String WORK_TAG_MAINTENANCE = "daily_notification_maintenance";
|
||||||
|
|
||||||
|
private static final int NETWORK_TIMEOUT_MS = 30000; // 30 seconds
|
||||||
|
private static final int MAX_RETRY_ATTEMPTS = 3;
|
||||||
|
private static final long RETRY_DELAY_MS = 60000; // 1 minute
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationStorage storage;
|
||||||
|
private final WorkManager workManager;
|
||||||
|
|
||||||
|
// ETag manager for efficient fetching
|
||||||
|
private final DailyNotificationETagManager etagManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param storage Storage instance for saving fetched content
|
||||||
|
*/
|
||||||
|
public DailyNotificationFetcher(Context context, DailyNotificationStorage storage) {
|
||||||
|
this.context = context;
|
||||||
|
this.storage = storage;
|
||||||
|
this.workManager = WorkManager.getInstance(context);
|
||||||
|
this.etagManager = new DailyNotificationETagManager(storage);
|
||||||
|
|
||||||
|
Log.d(TAG, "DailyNotificationFetcher initialized with ETag support");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule a background fetch for content
|
||||||
|
*
|
||||||
|
* @param scheduledTime When the notification is scheduled for
|
||||||
|
*/
|
||||||
|
public void scheduleFetch(long scheduledTime) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling background fetch for " + scheduledTime);
|
||||||
|
|
||||||
|
// Calculate fetch time (1 hour before notification)
|
||||||
|
long fetchTime = scheduledTime - TimeUnit.HOURS.toMillis(1);
|
||||||
|
|
||||||
|
if (fetchTime > System.currentTimeMillis()) {
|
||||||
|
// Create work data
|
||||||
|
Data inputData = new Data.Builder()
|
||||||
|
.putLong("scheduled_time", scheduledTime)
|
||||||
|
.putLong("fetch_time", fetchTime)
|
||||||
|
.putInt("retry_count", 0)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
// Create one-time work request
|
||||||
|
OneTimeWorkRequest fetchWork = new OneTimeWorkRequest.Builder(
|
||||||
|
DailyNotificationFetchWorker.class)
|
||||||
|
.setInputData(inputData)
|
||||||
|
.addTag(WORK_TAG_FETCH)
|
||||||
|
.setInitialDelay(fetchTime - System.currentTimeMillis(), TimeUnit.MILLISECONDS)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
// Enqueue the work
|
||||||
|
workManager.enqueue(fetchWork);
|
||||||
|
|
||||||
|
Log.i(TAG, "Background fetch scheduled successfully");
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Fetch time has already passed, scheduling immediate fetch");
|
||||||
|
scheduleImmediateFetch();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling background fetch", e);
|
||||||
|
// Fallback to immediate fetch
|
||||||
|
scheduleImmediateFetch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule an immediate fetch (fallback)
|
||||||
|
*/
|
||||||
|
public void scheduleImmediateFetch() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling immediate fetch");
|
||||||
|
|
||||||
|
Data inputData = new Data.Builder()
|
||||||
|
.putLong("scheduled_time", System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1))
|
||||||
|
.putLong("fetch_time", System.currentTimeMillis())
|
||||||
|
.putInt("retry_count", 0)
|
||||||
|
.putBoolean("immediate", true)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
OneTimeWorkRequest fetchWork = new OneTimeWorkRequest.Builder(
|
||||||
|
DailyNotificationFetchWorker.class)
|
||||||
|
.setInputData(inputData)
|
||||||
|
.addTag(WORK_TAG_FETCH)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
workManager.enqueue(fetchWork);
|
||||||
|
|
||||||
|
Log.i(TAG, "Immediate fetch scheduled successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling immediate fetch", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch content immediately (synchronous)
|
||||||
|
*
|
||||||
|
* @return Fetched notification content or null if failed
|
||||||
|
*/
|
||||||
|
public NotificationContent fetchContentImmediately() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Fetching content immediately");
|
||||||
|
|
||||||
|
// Check if we should fetch new content
|
||||||
|
if (!storage.shouldFetchNewContent()) {
|
||||||
|
Log.d(TAG, "Content fetch not needed yet");
|
||||||
|
return storage.getLastNotification();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attempt to fetch from network
|
||||||
|
NotificationContent content = fetchFromNetwork();
|
||||||
|
|
||||||
|
if (content != null) {
|
||||||
|
// Save to storage
|
||||||
|
storage.saveNotificationContent(content);
|
||||||
|
storage.setLastFetchTime(System.currentTimeMillis());
|
||||||
|
|
||||||
|
Log.i(TAG, "Content fetched and saved successfully");
|
||||||
|
return content;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Fallback to cached content
|
||||||
|
Log.w(TAG, "Network fetch failed, using cached content");
|
||||||
|
return getFallbackContent();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during immediate content fetch", e);
|
||||||
|
return getFallbackContent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch content from network with ETag support
|
||||||
|
*
|
||||||
|
* @return Fetched content or null if failed
|
||||||
|
*/
|
||||||
|
private NotificationContent fetchFromNetwork() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Fetching content from network with ETag support");
|
||||||
|
|
||||||
|
// Get content endpoint URL
|
||||||
|
String contentUrl = getContentEndpoint();
|
||||||
|
|
||||||
|
// Make conditional request with ETag
|
||||||
|
DailyNotificationETagManager.ConditionalRequestResult result =
|
||||||
|
etagManager.makeConditionalRequest(contentUrl);
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
if (result.isFromCache) {
|
||||||
|
Log.d(TAG, "Content not modified (304) - using cached content");
|
||||||
|
return storage.getLastNotification();
|
||||||
|
} else {
|
||||||
|
Log.d(TAG, "New content available (200) - parsing response");
|
||||||
|
return parseNetworkResponse(result.content);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Conditional request failed: " + result.error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during network fetch with ETag", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse network response into notification content
|
||||||
|
*
|
||||||
|
* @param connection HTTP connection with response
|
||||||
|
* @return Parsed notification content or null if parsing failed
|
||||||
|
*/
|
||||||
|
private NotificationContent parseNetworkResponse(HttpURLConnection connection) {
|
||||||
|
try {
|
||||||
|
// This is a simplified parser - in production you'd use a proper JSON parser
|
||||||
|
// For now, we'll create a placeholder content
|
||||||
|
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.setTitle("Daily Update");
|
||||||
|
content.setBody("Your daily notification is ready");
|
||||||
|
content.setScheduledTime(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1));
|
||||||
|
content.setFetchTime(System.currentTimeMillis());
|
||||||
|
|
||||||
|
return content;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error parsing network response", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse network response string into notification content
|
||||||
|
*
|
||||||
|
* @param responseString Response content as string
|
||||||
|
* @return Parsed notification content or null if parsing failed
|
||||||
|
*/
|
||||||
|
private NotificationContent parseNetworkResponse(String responseString) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Parsing network response string");
|
||||||
|
|
||||||
|
// This is a simplified parser - in production you'd use a proper JSON parser
|
||||||
|
// For now, we'll create a placeholder content
|
||||||
|
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.setTitle("Daily Update");
|
||||||
|
content.setBody("Your daily notification is ready");
|
||||||
|
content.setScheduledTime(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1));
|
||||||
|
content.setFetchTime(System.currentTimeMillis());
|
||||||
|
|
||||||
|
Log.d(TAG, "Network response parsed successfully");
|
||||||
|
return content;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error parsing network response string", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fallback content when network fetch fails
|
||||||
|
*
|
||||||
|
* @return Fallback notification content
|
||||||
|
*/
|
||||||
|
private NotificationContent getFallbackContent() {
|
||||||
|
try {
|
||||||
|
// Try to get last known good content
|
||||||
|
NotificationContent lastContent = storage.getLastNotification();
|
||||||
|
|
||||||
|
if (lastContent != null && !lastContent.isStale()) {
|
||||||
|
Log.d(TAG, "Using last known good content as fallback");
|
||||||
|
return lastContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create emergency fallback content
|
||||||
|
Log.w(TAG, "Creating emergency fallback content");
|
||||||
|
return createEmergencyFallbackContent();
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting fallback content", e);
|
||||||
|
return createEmergencyFallbackContent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create emergency fallback content
|
||||||
|
*
|
||||||
|
* @return Emergency notification content
|
||||||
|
*/
|
||||||
|
private NotificationContent createEmergencyFallbackContent() {
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.setTitle("Daily Update");
|
||||||
|
content.setBody("🌅 Good morning! Ready to make today amazing?");
|
||||||
|
content.setScheduledTime(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1));
|
||||||
|
content.setFetchTime(System.currentTimeMillis());
|
||||||
|
content.setPriority("default");
|
||||||
|
content.setSound(true);
|
||||||
|
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the content endpoint URL
|
||||||
|
*
|
||||||
|
* @return Content endpoint URL
|
||||||
|
*/
|
||||||
|
private String getContentEndpoint() {
|
||||||
|
// This would typically come from configuration
|
||||||
|
// For now, return a placeholder
|
||||||
|
return "https://api.timesafari.com/daily-content";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule maintenance work
|
||||||
|
*/
|
||||||
|
public void scheduleMaintenance() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling maintenance work");
|
||||||
|
|
||||||
|
Data inputData = new Data.Builder()
|
||||||
|
.putLong("maintenance_time", System.currentTimeMillis())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
OneTimeWorkRequest maintenanceWork = new OneTimeWorkRequest.Builder(
|
||||||
|
DailyNotificationMaintenanceWorker.class)
|
||||||
|
.setInputData(inputData)
|
||||||
|
.addTag(WORK_TAG_MAINTENANCE)
|
||||||
|
.setInitialDelay(TimeUnit.HOURS.toMillis(2), TimeUnit.MILLISECONDS)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
workManager.enqueue(maintenanceWork);
|
||||||
|
|
||||||
|
Log.i(TAG, "Maintenance work scheduled successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling maintenance work", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancel all scheduled fetch work
|
||||||
|
*/
|
||||||
|
public void cancelAllFetchWork() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Cancelling all fetch work");
|
||||||
|
|
||||||
|
workManager.cancelAllWorkByTag(WORK_TAG_FETCH);
|
||||||
|
workManager.cancelAllWorkByTag(WORK_TAG_MAINTENANCE);
|
||||||
|
|
||||||
|
Log.i(TAG, "All fetch work cancelled");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error cancelling fetch work", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if fetch work is scheduled
|
||||||
|
*
|
||||||
|
* @return true if fetch work is scheduled
|
||||||
|
*/
|
||||||
|
public boolean isFetchWorkScheduled() {
|
||||||
|
// This would check WorkManager for pending work
|
||||||
|
// For now, return a placeholder
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fetch statistics
|
||||||
|
*
|
||||||
|
* @return Fetch statistics as a string
|
||||||
|
*/
|
||||||
|
public String getFetchStats() {
|
||||||
|
return String.format("Last fetch: %d, Fetch work scheduled: %s",
|
||||||
|
storage.getLastFetchTime(),
|
||||||
|
isFetchWorkScheduled() ? "yes" : "no");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get ETag manager for external access
|
||||||
|
*
|
||||||
|
* @return ETag manager instance
|
||||||
|
*/
|
||||||
|
public DailyNotificationETagManager getETagManager() {
|
||||||
|
return etagManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get network efficiency metrics
|
||||||
|
*
|
||||||
|
* @return Network metrics
|
||||||
|
*/
|
||||||
|
public DailyNotificationETagManager.NetworkMetrics getNetworkMetrics() {
|
||||||
|
return etagManager.getMetrics();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get ETag cache statistics
|
||||||
|
*
|
||||||
|
* @return Cache statistics
|
||||||
|
*/
|
||||||
|
public DailyNotificationETagManager.CacheStatistics getCacheStatistics() {
|
||||||
|
return etagManager.getCacheStatistics();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clean expired ETags
|
||||||
|
*/
|
||||||
|
public void cleanExpiredETags() {
|
||||||
|
etagManager.cleanExpiredETags();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reset network metrics
|
||||||
|
*/
|
||||||
|
public void resetNetworkMetrics() {
|
||||||
|
etagManager.resetMetrics();
|
||||||
|
}
|
||||||
|
}
|
||||||
407
src/android/DailyNotificationJWTManager.java
Normal file
407
src/android/DailyNotificationJWTManager.java
Normal file
@@ -0,0 +1,407 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationJWTManager.java
|
||||||
|
*
|
||||||
|
* Android JWT Manager for TimeSafari authentication enhancement
|
||||||
|
* Extends existing ETagManager infrastructure with DID-based JWT authentication
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
* @created 2025-10-03 06:53:30 UTC
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Base64;
|
||||||
|
import javax.crypto.Mac;
|
||||||
|
import javax.crypto.spec.SecretKeySpec;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages JWT authentication for TimeSafari integration
|
||||||
|
*
|
||||||
|
* This class extends the existing ETagManager infrastructure by adding:
|
||||||
|
* - DID-based JWT token generation
|
||||||
|
* - Automatic JWT header injection into HTTP requests
|
||||||
|
* - JWT token expiration management
|
||||||
|
* - Integration with existing DailyNotificationETagManager
|
||||||
|
*
|
||||||
|
* Phase 1 Implementation: Extends existing DailyNotificationETagManager.java
|
||||||
|
*/
|
||||||
|
public class DailyNotificationJWTManager {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationJWTManager";
|
||||||
|
|
||||||
|
// JWT Headers
|
||||||
|
private static final String HEADER_AUTHORIZATION = "Authorization";
|
||||||
|
private static final String HEADER_CONTENT_TYPE = "Content-Type";
|
||||||
|
|
||||||
|
// JWT Configuration
|
||||||
|
private static final int DEFAULT_JWT_EXPIRATION_SECONDS = 60;
|
||||||
|
|
||||||
|
// JWT Algorithm (simplified for Phase 1)
|
||||||
|
private static final String ALGORITHM = "HS256";
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final DailyNotificationStorage storage;
|
||||||
|
private final DailyNotificationETagManager eTagManager;
|
||||||
|
|
||||||
|
// Current authentication state
|
||||||
|
private String currentActiveDid;
|
||||||
|
private String currentJWTToken;
|
||||||
|
private long jwtExpirationTime;
|
||||||
|
|
||||||
|
// Configuration
|
||||||
|
private int jwtExpirationSeconds;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param storage Storage instance for persistence
|
||||||
|
* @param eTagManager ETagManager instance for HTTP enhancements
|
||||||
|
*/
|
||||||
|
public DailyNotificationJWTManager(DailyNotificationStorage storage, DailyNotificationETagManager eTagManager) {
|
||||||
|
this.storage = storage;
|
||||||
|
this.eTagManager = eTagManager;
|
||||||
|
this.jwtExpirationSeconds = DEFAULT_JWT_EXPIRATION_SECONDS;
|
||||||
|
|
||||||
|
Log.d(TAG, "JWTManager initialized with ETagManager integration");
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - ActiveDid Management
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the active DID for authentication
|
||||||
|
*
|
||||||
|
* @param activeDid The DID to use for JWT generation
|
||||||
|
*/
|
||||||
|
public void setActiveDid(String activeDid) {
|
||||||
|
setActiveDid(activeDid, DEFAULT_JWT_EXPIRATION_SECONDS);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the active DID for authentication with custom expiration
|
||||||
|
*
|
||||||
|
* @param activeDid The DID to use for JWT generation
|
||||||
|
* @param expirationSeconds JWT expiration time in seconds
|
||||||
|
*/
|
||||||
|
public void setActiveDid(String activeDid, int expirationSeconds) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Setting activeDid: " + activeDid + " with " + expirationSeconds + "s expiration");
|
||||||
|
|
||||||
|
this.currentActiveDid = activeDid;
|
||||||
|
this.jwtExpirationSeconds = expirationSeconds;
|
||||||
|
|
||||||
|
// Generate new JWT token immediately
|
||||||
|
generateAndCacheJWT();
|
||||||
|
|
||||||
|
Log.i(TAG, "ActiveDid set successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error setting activeDid", e);
|
||||||
|
throw new RuntimeException("Failed to set activeDid", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current active DID
|
||||||
|
*
|
||||||
|
* @return Current active DID or null if not set
|
||||||
|
*/
|
||||||
|
public String getCurrentActiveDid() {
|
||||||
|
return currentActiveDid;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if we have a valid active DID and JWT token
|
||||||
|
*
|
||||||
|
* @return true if authentication is ready
|
||||||
|
*/
|
||||||
|
public boolean isAuthenticated() {
|
||||||
|
return currentActiveDid != null &&
|
||||||
|
currentJWTToken != null &&
|
||||||
|
!isTokenExpired();
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - JWT Token Management
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate JWT token for current activeDid
|
||||||
|
*
|
||||||
|
* @param expiresInSeconds Expiration time in seconds
|
||||||
|
* @return Generated JWT token
|
||||||
|
*/
|
||||||
|
public String generateJWTForActiveDid(String activeDid, int expiresInSeconds) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Generating JWT for activeDid: " + activeDid);
|
||||||
|
|
||||||
|
long currentTime = System.currentTimeMillis() / 1000;
|
||||||
|
|
||||||
|
// Create JWT payload
|
||||||
|
Map<String, Object> payload = new HashMap<>();
|
||||||
|
payload.put("exp", currentTime + expiresInSeconds);
|
||||||
|
payload.put("iat", currentTime);
|
||||||
|
payload.put("iss", activeDid);
|
||||||
|
payload.put("aud", "timesafari.notifications");
|
||||||
|
payload.put("sub", activeDid);
|
||||||
|
|
||||||
|
// Generate JWT token (simplified implementation for Phase 1)
|
||||||
|
String jwt = signWithDID(payload, activeDid);
|
||||||
|
|
||||||
|
Log.d(TAG, "JWT generated successfully");
|
||||||
|
return jwt;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error generating JWT", e);
|
||||||
|
throw new RuntimeException("Failed to generate JWT", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate and cache JWT token for current activeDid
|
||||||
|
*/
|
||||||
|
private void generateAndCacheJWT() {
|
||||||
|
if (currentActiveDid == null) {
|
||||||
|
Log.w(TAG, "Cannot generate JWT: no activeDid set");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
currentJWTToken = generateJWTForActiveDid(currentActiveDid, jwtExpirationSeconds);
|
||||||
|
jwtExpirationTime = System.currentTimeMillis() + (jwtExpirationSeconds * 1000L);
|
||||||
|
|
||||||
|
Log.d(TAG, "JWT cached successfully, expires at: " + jwtExpirationTime);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error caching JWT", e);
|
||||||
|
throw new RuntimeException("Failed to cache JWT", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if current JWT token is expired
|
||||||
|
*
|
||||||
|
* @return true if token is expired
|
||||||
|
*/
|
||||||
|
private boolean isTokenExpired() {
|
||||||
|
return currentJWTToken == null || System.currentTimeMillis() >= jwtExpirationTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Refresh JWT token if needed
|
||||||
|
*/
|
||||||
|
public void refreshJWTIfNeeded() {
|
||||||
|
if (isTokenExpired()) {
|
||||||
|
Log.d(TAG, "JWT token expired, refreshing");
|
||||||
|
generateAndCacheJWT();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get current valid JWT token (refreshes if needed)
|
||||||
|
*
|
||||||
|
* @return Current JWT token
|
||||||
|
*/
|
||||||
|
public String getCurrentJWTToken() {
|
||||||
|
refreshJWTIfNeeded();
|
||||||
|
return currentJWTToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - HTTP Client Enhancement
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enhance HTTP client with JWT authentication headers
|
||||||
|
*
|
||||||
|
* Extends existing DailyNotificationETagManager connection creation
|
||||||
|
*
|
||||||
|
* @param connection HTTP connection to enhance
|
||||||
|
* @param activeDid DID for authentication (optional, uses current if null)
|
||||||
|
*/
|
||||||
|
public void enhanceHttpClientWithJWT(HttpURLConnection connection, String activeDid) {
|
||||||
|
try {
|
||||||
|
// Set activeDid if provided
|
||||||
|
if (activeDid != null && !activeDid.equals(currentActiveDid)) {
|
||||||
|
setActiveDid(activeDid);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure we have a valid token
|
||||||
|
if (!isAuthenticated()) {
|
||||||
|
throw new IllegalStateException("No valid authentication available");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add JWT Authorization header
|
||||||
|
String jwt = getCurrentJWTToken();
|
||||||
|
connection.setRequestProperty(HEADER_AUTHORIZATION, "Bearer " + jwt);
|
||||||
|
|
||||||
|
// Set JSON content type for API requests
|
||||||
|
connection.setRequestProperty(HEADER_CONTENT_TYPE, "application/json");
|
||||||
|
|
||||||
|
Log.d(TAG, "HTTP client enhanced with JWT authentication");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error enhancing HTTP client with JWT", e);
|
||||||
|
throw new RuntimeException("Failed to enhance HTTP client", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enhance HTTP client with JWT authentication for current activeDid
|
||||||
|
*
|
||||||
|
* @param connection HTTP connection to enhance
|
||||||
|
*/
|
||||||
|
public void enhanceHttpClientWithJWT(HttpURLConnection connection) {
|
||||||
|
enhanceHttpClientWithJWT(connection, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - JWT Signing (Simplified for Phase 1)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sign JWT payload with DID (simplified implementation)
|
||||||
|
*
|
||||||
|
* Phase 1: Basic implementation using DID-based signing
|
||||||
|
* Later phases: Integrate with proper DID cryptography
|
||||||
|
*
|
||||||
|
* @param payload JWT payload
|
||||||
|
* @param did DID for signing
|
||||||
|
* @return Signed JWT token
|
||||||
|
*/
|
||||||
|
private String signWithDID(Map<String, Object> payload, String did) {
|
||||||
|
try {
|
||||||
|
// Phase 1: Simplified JWT implementation
|
||||||
|
// In production, this would use proper DID + cryptography libraries
|
||||||
|
|
||||||
|
// Create JWT header
|
||||||
|
Map<String, Object> header = new HashMap<>();
|
||||||
|
header.put("alg", ALGORITHM);
|
||||||
|
header.put("typ", "JWT");
|
||||||
|
|
||||||
|
// Encode header and payload
|
||||||
|
StringBuilder jwtBuilder = new StringBuilder();
|
||||||
|
|
||||||
|
// Header
|
||||||
|
jwtBuilder.append(base64UrlEncode(mapToJson(header)));
|
||||||
|
jwtBuilder.append(".");
|
||||||
|
|
||||||
|
// Payload
|
||||||
|
jwtBuilder.append(base64UrlEncode(mapToJson(payload)));
|
||||||
|
jwtBuilder.append(".");
|
||||||
|
|
||||||
|
// Signature (simplified - would use proper DID signing)
|
||||||
|
String signature = createSignature(jwtBuilder.toString(), did);
|
||||||
|
jwtBuilder.append(signature);
|
||||||
|
|
||||||
|
String jwt = jwtBuilder.toString();
|
||||||
|
Log.d(TAG, "JWT signed successfully (length: " + jwt.length() + ")");
|
||||||
|
|
||||||
|
return jwt;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error signing JWT", e);
|
||||||
|
throw new RuntimeException("Failed to sign JWT", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create JWT signature (simplified for Phase 1)
|
||||||
|
*
|
||||||
|
* @param data Data to sign
|
||||||
|
* @param did DID for signature
|
||||||
|
* @return Base64-encoded signature
|
||||||
|
*/
|
||||||
|
private String createSignature(String data, String did) throws Exception {
|
||||||
|
// Phase 1: Simplified signature using DID hash
|
||||||
|
// Production would use proper DID cryptographic signing
|
||||||
|
|
||||||
|
MessageDigest digest = MessageDigest.getInstance("SHA-256");
|
||||||
|
byte[] hash = digest.digest((data + ":" + did).getBytes(StandardCharsets.UTF_8));
|
||||||
|
|
||||||
|
return base64UrlEncode(hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert map to JSON string (simplified)
|
||||||
|
*/
|
||||||
|
private String mapToJson(Map<String, Object> map) {
|
||||||
|
StringBuilder json = new StringBuilder("{");
|
||||||
|
boolean first = true;
|
||||||
|
|
||||||
|
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||||
|
if (!first) json.append(",");
|
||||||
|
json.append("\"").append(entry.getKey()).append("\":");
|
||||||
|
|
||||||
|
Object value = entry.getValue();
|
||||||
|
if (value instanceof String) {
|
||||||
|
json.append("\"").append(value).append("\"");
|
||||||
|
} else {
|
||||||
|
json.append(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
first = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
json.append("}");
|
||||||
|
return json.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Base64 URL-safe encoding
|
||||||
|
*/
|
||||||
|
private String base64UrlEncode(byte[] data) {
|
||||||
|
return Base64.getUrlEncoder()
|
||||||
|
.withoutPadding()
|
||||||
|
.encodeToString(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Base64 URL-safe encoding for strings
|
||||||
|
*/
|
||||||
|
private String base64UrlEncode(String data) {
|
||||||
|
return base64UrlEncode(data.getBytes(StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Testing and Debugging
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get current JWT token info for debugging
|
||||||
|
*
|
||||||
|
* @return Token information
|
||||||
|
*/
|
||||||
|
public String getTokenDebugInfo() {
|
||||||
|
return String.format(
|
||||||
|
"JWT Token Info - ActiveDID: %s, HasToken: %s, Expired: %s, ExpiresAt: %d",
|
||||||
|
currentActiveDid,
|
||||||
|
currentJWTToken != null,
|
||||||
|
isTokenExpired(),
|
||||||
|
jwtExpirationTime
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear authentication state
|
||||||
|
*/
|
||||||
|
public void clearAuthentication() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Clearing authentication state");
|
||||||
|
|
||||||
|
currentActiveDid = null;
|
||||||
|
currentJWTToken = null;
|
||||||
|
jwtExpirationTime = 0;
|
||||||
|
|
||||||
|
Log.i(TAG, "Authentication state cleared");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error clearing authentication", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
403
src/android/DailyNotificationMaintenanceWorker.java
Normal file
403
src/android/DailyNotificationMaintenanceWorker.java
Normal file
@@ -0,0 +1,403 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationMaintenanceWorker.java
|
||||||
|
*
|
||||||
|
* WorkManager worker for maintenance tasks
|
||||||
|
* Handles cleanup, optimization, and system health checks
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.work.Data;
|
||||||
|
import androidx.work.Worker;
|
||||||
|
import androidx.work.WorkerParameters;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Background worker for maintenance tasks
|
||||||
|
*
|
||||||
|
* This worker handles periodic maintenance of the notification system,
|
||||||
|
* including cleanup of old data, optimization of storage, and health checks.
|
||||||
|
*/
|
||||||
|
public class DailyNotificationMaintenanceWorker extends Worker {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationMaintenanceWorker";
|
||||||
|
private static final String KEY_MAINTENANCE_TIME = "maintenance_time";
|
||||||
|
|
||||||
|
private static final long WORK_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes total
|
||||||
|
private static final int MAX_NOTIFICATIONS_TO_KEEP = 50; // Keep only recent notifications
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationStorage storage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param params Worker parameters
|
||||||
|
*/
|
||||||
|
public DailyNotificationMaintenanceWorker(@NonNull Context context,
|
||||||
|
@NonNull WorkerParameters params) {
|
||||||
|
super(context, params);
|
||||||
|
this.context = context;
|
||||||
|
this.storage = new DailyNotificationStorage(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Main work method - perform maintenance tasks
|
||||||
|
*
|
||||||
|
* @return Result indicating success or failure
|
||||||
|
*/
|
||||||
|
@NonNull
|
||||||
|
@Override
|
||||||
|
public Result doWork() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Starting maintenance work");
|
||||||
|
|
||||||
|
// Get input data
|
||||||
|
Data inputData = getInputData();
|
||||||
|
long maintenanceTime = inputData.getLong(KEY_MAINTENANCE_TIME, 0);
|
||||||
|
|
||||||
|
Log.d(TAG, "Maintenance time: " + maintenanceTime);
|
||||||
|
|
||||||
|
// Perform maintenance tasks
|
||||||
|
boolean success = performMaintenance();
|
||||||
|
|
||||||
|
if (success) {
|
||||||
|
Log.i(TAG, "Maintenance completed successfully");
|
||||||
|
return Result.success();
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Maintenance completed with warnings");
|
||||||
|
return Result.success(); // Still consider it successful
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during maintenance work", e);
|
||||||
|
return Result.failure();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform all maintenance tasks
|
||||||
|
*
|
||||||
|
* @return true if all tasks completed successfully
|
||||||
|
*/
|
||||||
|
private boolean performMaintenance() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Performing maintenance tasks");
|
||||||
|
|
||||||
|
boolean allSuccessful = true;
|
||||||
|
|
||||||
|
// Task 1: Clean up old notifications
|
||||||
|
boolean cleanupSuccess = cleanupOldNotifications();
|
||||||
|
if (!cleanupSuccess) {
|
||||||
|
allSuccessful = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Task 2: Optimize storage
|
||||||
|
boolean optimizationSuccess = optimizeStorage();
|
||||||
|
if (!optimizationSuccess) {
|
||||||
|
allSuccessful = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Task 3: Health check
|
||||||
|
boolean healthCheckSuccess = performHealthCheck();
|
||||||
|
if (!healthCheckSuccess) {
|
||||||
|
allSuccessful = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Task 4: Schedule next maintenance
|
||||||
|
scheduleNextMaintenance();
|
||||||
|
|
||||||
|
Log.d(TAG, "Maintenance tasks completed. All successful: " + allSuccessful);
|
||||||
|
return allSuccessful;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during maintenance tasks", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clean up old notifications
|
||||||
|
*
|
||||||
|
* @return true if cleanup was successful
|
||||||
|
*/
|
||||||
|
private boolean cleanupOldNotifications() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Cleaning up old notifications");
|
||||||
|
|
||||||
|
// Get all notifications
|
||||||
|
List<NotificationContent> allNotifications = storage.getAllNotifications();
|
||||||
|
int initialCount = allNotifications.size();
|
||||||
|
|
||||||
|
if (initialCount <= MAX_NOTIFICATIONS_TO_KEEP) {
|
||||||
|
Log.d(TAG, "No cleanup needed, notification count: " + initialCount);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove old notifications, keeping the most recent ones
|
||||||
|
int notificationsToRemove = initialCount - MAX_NOTIFICATIONS_TO_KEEP;
|
||||||
|
int removedCount = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < notificationsToRemove && i < allNotifications.size(); i++) {
|
||||||
|
NotificationContent notification = allNotifications.get(i);
|
||||||
|
storage.removeNotification(notification.getId());
|
||||||
|
removedCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Cleanup completed. Removed " + removedCount + " old notifications");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during notification cleanup", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize storage usage
|
||||||
|
*
|
||||||
|
* @return true if optimization was successful
|
||||||
|
*/
|
||||||
|
private boolean optimizeStorage() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing storage");
|
||||||
|
|
||||||
|
// Get storage statistics
|
||||||
|
String stats = storage.getStorageStats();
|
||||||
|
Log.d(TAG, "Storage stats before optimization: " + stats);
|
||||||
|
|
||||||
|
// Perform storage optimization
|
||||||
|
// This could include:
|
||||||
|
// - Compacting data structures
|
||||||
|
// - Removing duplicate entries
|
||||||
|
// - Optimizing cache usage
|
||||||
|
|
||||||
|
// For now, just log the current state
|
||||||
|
Log.d(TAG, "Storage optimization completed");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during storage optimization", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform system health check
|
||||||
|
*
|
||||||
|
* @return true if health check passed
|
||||||
|
*/
|
||||||
|
private boolean performHealthCheck() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Performing health check");
|
||||||
|
|
||||||
|
boolean healthOk = true;
|
||||||
|
|
||||||
|
// Check 1: Storage health
|
||||||
|
boolean storageHealth = checkStorageHealth();
|
||||||
|
if (!storageHealth) {
|
||||||
|
healthOk = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check 2: Notification count health
|
||||||
|
boolean countHealth = checkNotificationCountHealth();
|
||||||
|
if (!countHealth) {
|
||||||
|
healthOk = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check 3: Data integrity
|
||||||
|
boolean dataIntegrity = checkDataIntegrity();
|
||||||
|
if (!dataIntegrity) {
|
||||||
|
healthOk = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (healthOk) {
|
||||||
|
Log.i(TAG, "Health check passed");
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Health check failed - some issues detected");
|
||||||
|
}
|
||||||
|
|
||||||
|
return healthOk;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during health check", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check storage health
|
||||||
|
*
|
||||||
|
* @return true if storage is healthy
|
||||||
|
*/
|
||||||
|
private boolean checkStorageHealth() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Checking storage health");
|
||||||
|
|
||||||
|
// Check if storage is accessible
|
||||||
|
int notificationCount = storage.getNotificationCount();
|
||||||
|
|
||||||
|
if (notificationCount < 0) {
|
||||||
|
Log.w(TAG, "Storage health issue: Invalid notification count");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if storage is empty (this might be normal)
|
||||||
|
if (storage.isEmpty()) {
|
||||||
|
Log.d(TAG, "Storage is empty (this might be normal)");
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Storage health check passed");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking storage health", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check notification count health
|
||||||
|
*
|
||||||
|
* @return true if notification count is healthy
|
||||||
|
*/
|
||||||
|
private boolean checkNotificationCountHealth() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Checking notification count health");
|
||||||
|
|
||||||
|
int notificationCount = storage.getNotificationCount();
|
||||||
|
|
||||||
|
// Check for reasonable limits
|
||||||
|
if (notificationCount > 1000) {
|
||||||
|
Log.w(TAG, "Notification count health issue: Too many notifications (" +
|
||||||
|
notificationCount + ")");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Notification count health check passed: " + notificationCount);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking notification count health", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check data integrity
|
||||||
|
*
|
||||||
|
* @return true if data integrity is good
|
||||||
|
*/
|
||||||
|
private boolean checkDataIntegrity() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Checking data integrity");
|
||||||
|
|
||||||
|
// Get all notifications and check basic integrity
|
||||||
|
List<NotificationContent> allNotifications = storage.getAllNotifications();
|
||||||
|
|
||||||
|
for (NotificationContent notification : allNotifications) {
|
||||||
|
// Check required fields
|
||||||
|
if (notification.getId() == null || notification.getId().isEmpty()) {
|
||||||
|
Log.w(TAG, "Data integrity issue: Notification with null/empty ID");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notification.getTitle() == null || notification.getTitle().isEmpty()) {
|
||||||
|
Log.w(TAG, "Data integrity issue: Notification with null/empty title");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notification.getBody() == null || notification.getBody().isEmpty()) {
|
||||||
|
Log.w(TAG, "Data integrity issue: Notification with null/empty body");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check timestamp validity
|
||||||
|
if (notification.getScheduledTime() <= 0) {
|
||||||
|
Log.w(TAG, "Data integrity issue: Invalid scheduled time");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notification.getFetchTime() <= 0) {
|
||||||
|
Log.w(TAG, "Data integrity issue: Invalid fetch time");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Data integrity check passed");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking data integrity", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule next maintenance run
|
||||||
|
*/
|
||||||
|
private void scheduleNextMaintenance() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling next maintenance");
|
||||||
|
|
||||||
|
// Schedule maintenance for tomorrow at 2 AM
|
||||||
|
long nextMaintenanceTime = calculateNextMaintenanceTime();
|
||||||
|
|
||||||
|
Data maintenanceData = new Data.Builder()
|
||||||
|
.putLong(KEY_MAINTENANCE_TIME, nextMaintenanceTime)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
androidx.work.OneTimeWorkRequest maintenanceWork =
|
||||||
|
new androidx.work.OneTimeWorkRequest.Builder(DailyNotificationMaintenanceWorker.class)
|
||||||
|
.setInputData(maintenanceData)
|
||||||
|
.setInitialDelay(nextMaintenanceTime - System.currentTimeMillis(),
|
||||||
|
java.util.concurrent.TimeUnit.MILLISECONDS)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
androidx.work.WorkManager.getInstance(context).enqueue(maintenanceWork);
|
||||||
|
|
||||||
|
Log.i(TAG, "Next maintenance scheduled for " + nextMaintenanceTime);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling next maintenance", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate next maintenance time (2 AM tomorrow)
|
||||||
|
*
|
||||||
|
* @return Timestamp for next maintenance
|
||||||
|
*/
|
||||||
|
private long calculateNextMaintenanceTime() {
|
||||||
|
try {
|
||||||
|
java.util.Calendar calendar = java.util.Calendar.getInstance();
|
||||||
|
|
||||||
|
// Set to 2 AM
|
||||||
|
calendar.set(java.util.Calendar.HOUR_OF_DAY, 2);
|
||||||
|
calendar.set(java.util.Calendar.MINUTE, 0);
|
||||||
|
calendar.set(java.util.Calendar.SECOND, 0);
|
||||||
|
calendar.set(java.util.Calendar.MILLISECOND, 0);
|
||||||
|
|
||||||
|
// If 2 AM has passed today, schedule for tomorrow
|
||||||
|
if (calendar.getTimeInMillis() <= System.currentTimeMillis()) {
|
||||||
|
calendar.add(java.util.Calendar.DAY_OF_YEAR, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return calendar.getTimeInMillis();
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error calculating next maintenance time", e);
|
||||||
|
// Fallback: 24 hours from now
|
||||||
|
return System.currentTimeMillis() + (24 * 60 * 60 * 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
354
src/android/DailyNotificationMigration.java
Normal file
354
src/android/DailyNotificationMigration.java
Normal file
@@ -0,0 +1,354 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationMigration.java
|
||||||
|
*
|
||||||
|
* Migration utilities for transitioning from SharedPreferences to SQLite
|
||||||
|
* Handles data migration while preserving existing notification data
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.ContentValues;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
||||||
|
import java.lang.reflect.Type;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles migration from SharedPreferences to SQLite database
|
||||||
|
*
|
||||||
|
* This class provides utilities to:
|
||||||
|
* - Migrate existing notification data from SharedPreferences
|
||||||
|
* - Preserve all existing notification content during transition
|
||||||
|
* - Provide backward compatibility during migration period
|
||||||
|
* - Validate migration success
|
||||||
|
*/
|
||||||
|
public class DailyNotificationMigration {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationMigration";
|
||||||
|
private static final String PREFS_NAME = "DailyNotificationPrefs";
|
||||||
|
private static final String KEY_NOTIFICATIONS = "notifications";
|
||||||
|
private static final String KEY_SETTINGS = "settings";
|
||||||
|
private static final String KEY_LAST_FETCH = "last_fetch";
|
||||||
|
private static final String KEY_ADAPTIVE_SCHEDULING = "adaptive_scheduling";
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationDatabase database;
|
||||||
|
private final Gson gson;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param database SQLite database instance
|
||||||
|
*/
|
||||||
|
public DailyNotificationMigration(Context context, DailyNotificationDatabase database) {
|
||||||
|
this.context = context;
|
||||||
|
this.database = database;
|
||||||
|
this.gson = new Gson();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform complete migration from SharedPreferences to SQLite
|
||||||
|
*
|
||||||
|
* @return true if migration was successful
|
||||||
|
*/
|
||||||
|
public boolean migrateToSQLite() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Starting migration from SharedPreferences to SQLite");
|
||||||
|
|
||||||
|
// Check if migration is needed
|
||||||
|
if (!isMigrationNeeded()) {
|
||||||
|
Log.d(TAG, "Migration not needed - SQLite already up to date");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get writable database
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Start transaction for atomic migration
|
||||||
|
db.beginTransaction();
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Migrate notification content
|
||||||
|
int contentCount = migrateNotificationContent(db);
|
||||||
|
|
||||||
|
// Migrate settings
|
||||||
|
int settingsCount = migrateSettings(db);
|
||||||
|
|
||||||
|
// Mark migration as complete
|
||||||
|
markMigrationComplete(db);
|
||||||
|
|
||||||
|
// Commit transaction
|
||||||
|
db.setTransactionSuccessful();
|
||||||
|
|
||||||
|
Log.i(TAG, String.format("Migration completed successfully: %d notifications, %d settings",
|
||||||
|
contentCount, settingsCount));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during migration transaction", e);
|
||||||
|
db.endTransaction();
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
db.endTransaction();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during migration", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if migration is needed
|
||||||
|
*
|
||||||
|
* @return true if migration is required
|
||||||
|
*/
|
||||||
|
private boolean isMigrationNeeded() {
|
||||||
|
try {
|
||||||
|
// Check if SharedPreferences has data
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
|
||||||
|
String notificationsJson = prefs.getString(KEY_NOTIFICATIONS, "[]");
|
||||||
|
|
||||||
|
// Check if SQLite already has data
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
android.database.Cursor cursor = db.rawQuery(
|
||||||
|
"SELECT COUNT(*) FROM " + DailyNotificationDatabase.TABLE_NOTIF_CONTENTS, null);
|
||||||
|
|
||||||
|
int sqliteCount = 0;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
sqliteCount = cursor.getInt(0);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
// Migration needed if SharedPreferences has data but SQLite doesn't
|
||||||
|
boolean hasPrefsData = !notificationsJson.equals("[]") && !notificationsJson.isEmpty();
|
||||||
|
boolean needsMigration = hasPrefsData && sqliteCount == 0;
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("Migration check: prefs_data=%s, sqlite_count=%d, needed=%s",
|
||||||
|
hasPrefsData, sqliteCount, needsMigration));
|
||||||
|
|
||||||
|
return needsMigration;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking migration status", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Migrate notification content from SharedPreferences to SQLite
|
||||||
|
*
|
||||||
|
* @param db SQLite database instance
|
||||||
|
* @return Number of notifications migrated
|
||||||
|
*/
|
||||||
|
private int migrateNotificationContent(SQLiteDatabase db) {
|
||||||
|
try {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
|
||||||
|
String notificationsJson = prefs.getString(KEY_NOTIFICATIONS, "[]");
|
||||||
|
|
||||||
|
if (notificationsJson.equals("[]") || notificationsJson.isEmpty()) {
|
||||||
|
Log.d(TAG, "No notification content to migrate");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse JSON to List<NotificationContent>
|
||||||
|
Type type = new TypeToken<ArrayList<NotificationContent>>(){}.getType();
|
||||||
|
List<NotificationContent> notifications = gson.fromJson(notificationsJson, type);
|
||||||
|
|
||||||
|
int migratedCount = 0;
|
||||||
|
|
||||||
|
for (NotificationContent notification : notifications) {
|
||||||
|
try {
|
||||||
|
// Create ContentValues for notif_contents table
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONTENTS_SLOT_ID, notification.getId());
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONTENTS_PAYLOAD_JSON,
|
||||||
|
gson.toJson(notification));
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONTENTS_FETCHED_AT,
|
||||||
|
notification.getFetchedAt());
|
||||||
|
// ETag is null for migrated data
|
||||||
|
values.putNull(DailyNotificationDatabase.COL_CONTENTS_ETAG);
|
||||||
|
|
||||||
|
// Insert into notif_contents table
|
||||||
|
long rowId = db.insert(DailyNotificationDatabase.TABLE_NOTIF_CONTENTS, null, values);
|
||||||
|
|
||||||
|
if (rowId != -1) {
|
||||||
|
migratedCount++;
|
||||||
|
Log.d(TAG, "Migrated notification: " + notification.getId());
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Failed to migrate notification: " + notification.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error migrating notification: " + notification.getId(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Migrated " + migratedCount + " notifications to SQLite");
|
||||||
|
return migratedCount;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error migrating notification content", e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Migrate settings from SharedPreferences to SQLite
|
||||||
|
*
|
||||||
|
* @param db SQLite database instance
|
||||||
|
* @return Number of settings migrated
|
||||||
|
*/
|
||||||
|
private int migrateSettings(SQLiteDatabase db) {
|
||||||
|
try {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
|
||||||
|
int migratedCount = 0;
|
||||||
|
|
||||||
|
// Migrate last_fetch timestamp
|
||||||
|
long lastFetch = prefs.getLong(KEY_LAST_FETCH, 0);
|
||||||
|
if (lastFetch > 0) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_K, KEY_LAST_FETCH);
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_V, String.valueOf(lastFetch));
|
||||||
|
|
||||||
|
long rowId = db.insert(DailyNotificationDatabase.TABLE_NOTIF_CONFIG, null, values);
|
||||||
|
if (rowId != -1) {
|
||||||
|
migratedCount++;
|
||||||
|
Log.d(TAG, "Migrated last_fetch setting");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Migrate adaptive_scheduling setting
|
||||||
|
boolean adaptiveScheduling = prefs.getBoolean(KEY_ADAPTIVE_SCHEDULING, false);
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_K, KEY_ADAPTIVE_SCHEDULING);
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_V, String.valueOf(adaptiveScheduling));
|
||||||
|
|
||||||
|
long rowId = db.insert(DailyNotificationDatabase.TABLE_NOTIF_CONFIG, null, values);
|
||||||
|
if (rowId != -1) {
|
||||||
|
migratedCount++;
|
||||||
|
Log.d(TAG, "Migrated adaptive_scheduling setting");
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Migrated " + migratedCount + " settings to SQLite");
|
||||||
|
return migratedCount;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error migrating settings", e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark migration as complete in the database
|
||||||
|
*
|
||||||
|
* @param db SQLite database instance
|
||||||
|
*/
|
||||||
|
private void markMigrationComplete(SQLiteDatabase db) {
|
||||||
|
try {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_K, "migration_complete");
|
||||||
|
values.put(DailyNotificationDatabase.COL_CONFIG_V, String.valueOf(System.currentTimeMillis()));
|
||||||
|
|
||||||
|
db.insert(DailyNotificationDatabase.TABLE_NOTIF_CONFIG, null, values);
|
||||||
|
|
||||||
|
Log.d(TAG, "Migration marked as complete");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error marking migration complete", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validate migration success
|
||||||
|
*
|
||||||
|
* @return true if migration was successful
|
||||||
|
*/
|
||||||
|
public boolean validateMigration() {
|
||||||
|
try {
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
|
||||||
|
// Check if migration_complete flag exists
|
||||||
|
android.database.Cursor cursor = db.query(
|
||||||
|
DailyNotificationDatabase.TABLE_NOTIF_CONFIG,
|
||||||
|
new String[]{DailyNotificationDatabase.COL_CONFIG_V},
|
||||||
|
DailyNotificationDatabase.COL_CONFIG_K + " = ?",
|
||||||
|
new String[]{"migration_complete"},
|
||||||
|
null, null, null
|
||||||
|
);
|
||||||
|
|
||||||
|
boolean migrationComplete = cursor.moveToFirst();
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
if (!migrationComplete) {
|
||||||
|
Log.w(TAG, "Migration validation failed - migration_complete flag not found");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if we have notification content
|
||||||
|
cursor = db.rawQuery(
|
||||||
|
"SELECT COUNT(*) FROM " + DailyNotificationDatabase.TABLE_NOTIF_CONTENTS, null);
|
||||||
|
|
||||||
|
int contentCount = 0;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
contentCount = cursor.getInt(0);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
Log.i(TAG, "Migration validation successful - " + contentCount + " notifications in SQLite");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error validating migration", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get migration statistics
|
||||||
|
*
|
||||||
|
* @return Migration statistics string
|
||||||
|
*/
|
||||||
|
public String getMigrationStats() {
|
||||||
|
try {
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
|
||||||
|
// Count notifications
|
||||||
|
android.database.Cursor cursor = db.rawQuery(
|
||||||
|
"SELECT COUNT(*) FROM " + DailyNotificationDatabase.TABLE_NOTIF_CONTENTS, null);
|
||||||
|
int notificationCount = 0;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
notificationCount = cursor.getInt(0);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
// Count settings
|
||||||
|
cursor = db.rawQuery(
|
||||||
|
"SELECT COUNT(*) FROM " + DailyNotificationDatabase.TABLE_NOTIF_CONFIG, null);
|
||||||
|
int settingsCount = 0;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
settingsCount = cursor.getInt(0);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
return String.format("Migration stats: %d notifications, %d settings",
|
||||||
|
notificationCount, settingsCount);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting migration stats", e);
|
||||||
|
return "Migration stats: Error retrieving data";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
802
src/android/DailyNotificationPerformanceOptimizer.java
Normal file
802
src/android/DailyNotificationPerformanceOptimizer.java
Normal file
@@ -0,0 +1,802 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationPerformanceOptimizer.java
|
||||||
|
*
|
||||||
|
* Android Performance Optimizer for database, memory, and battery optimization
|
||||||
|
* Implements query optimization, memory management, and battery tracking
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Debug;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimizes performance through database, memory, and battery management
|
||||||
|
*
|
||||||
|
* This class implements the critical performance optimization functionality:
|
||||||
|
* - Database query optimization with indexes
|
||||||
|
* - Memory usage monitoring and optimization
|
||||||
|
* - Object pooling for frequently used objects
|
||||||
|
* - Battery usage tracking and optimization
|
||||||
|
* - Background CPU usage minimization
|
||||||
|
* - Network request optimization
|
||||||
|
*/
|
||||||
|
public class DailyNotificationPerformanceOptimizer {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationPerformanceOptimizer";
|
||||||
|
|
||||||
|
// Performance monitoring intervals
|
||||||
|
private static final long MEMORY_CHECK_INTERVAL_MS = TimeUnit.MINUTES.toMillis(5);
|
||||||
|
private static final long BATTERY_CHECK_INTERVAL_MS = TimeUnit.MINUTES.toMillis(10);
|
||||||
|
private static final long PERFORMANCE_REPORT_INTERVAL_MS = TimeUnit.HOURS.toMillis(1);
|
||||||
|
|
||||||
|
// Memory thresholds
|
||||||
|
private static final long MEMORY_WARNING_THRESHOLD_MB = 50;
|
||||||
|
private static final long MEMORY_CRITICAL_THRESHOLD_MB = 100;
|
||||||
|
|
||||||
|
// Object pool sizes
|
||||||
|
private static final int DEFAULT_POOL_SIZE = 10;
|
||||||
|
private static final int MAX_POOL_SIZE = 50;
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationDatabase database;
|
||||||
|
private final ScheduledExecutorService scheduler;
|
||||||
|
|
||||||
|
// Performance metrics
|
||||||
|
private final PerformanceMetrics metrics;
|
||||||
|
|
||||||
|
// Object pools
|
||||||
|
private final ConcurrentHashMap<Class<?>, ObjectPool<?>> objectPools;
|
||||||
|
|
||||||
|
// Memory monitoring
|
||||||
|
private final AtomicLong lastMemoryCheck;
|
||||||
|
private final AtomicLong lastBatteryCheck;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param database Database instance for optimization
|
||||||
|
*/
|
||||||
|
public DailyNotificationPerformanceOptimizer(Context context, DailyNotificationDatabase database) {
|
||||||
|
this.context = context;
|
||||||
|
this.database = database;
|
||||||
|
this.scheduler = Executors.newScheduledThreadPool(2);
|
||||||
|
this.metrics = new PerformanceMetrics();
|
||||||
|
this.objectPools = new ConcurrentHashMap<>();
|
||||||
|
this.lastMemoryCheck = new AtomicLong(0);
|
||||||
|
this.lastBatteryCheck = new AtomicLong(0);
|
||||||
|
|
||||||
|
// Initialize object pools
|
||||||
|
initializeObjectPools();
|
||||||
|
|
||||||
|
// Start performance monitoring
|
||||||
|
startPerformanceMonitoring();
|
||||||
|
|
||||||
|
Log.d(TAG, "PerformanceOptimizer initialized");
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Database Optimization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize database performance
|
||||||
|
*/
|
||||||
|
public void optimizeDatabase() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing database performance");
|
||||||
|
|
||||||
|
// Add database indexes
|
||||||
|
addDatabaseIndexes();
|
||||||
|
|
||||||
|
// Optimize query performance
|
||||||
|
optimizeQueryPerformance();
|
||||||
|
|
||||||
|
// Implement connection pooling
|
||||||
|
optimizeConnectionPooling();
|
||||||
|
|
||||||
|
// Analyze database performance
|
||||||
|
analyzeDatabasePerformance();
|
||||||
|
|
||||||
|
Log.i(TAG, "Database optimization completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing database", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add database indexes for query optimization
|
||||||
|
*/
|
||||||
|
private void addDatabaseIndexes() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Adding database indexes for query optimization");
|
||||||
|
|
||||||
|
// Add indexes for common queries
|
||||||
|
database.execSQL("CREATE INDEX IF NOT EXISTS idx_notif_contents_slot_time ON notif_contents(slot_id, fetched_at DESC)");
|
||||||
|
database.execSQL("CREATE INDEX IF NOT EXISTS idx_notif_deliveries_status ON notif_deliveries(status)");
|
||||||
|
database.execSQL("CREATE INDEX IF NOT EXISTS idx_notif_deliveries_fire_time ON notif_deliveries(fire_at)");
|
||||||
|
database.execSQL("CREATE INDEX IF NOT EXISTS idx_notif_config_key ON notif_config(k)");
|
||||||
|
|
||||||
|
// Add composite indexes for complex queries
|
||||||
|
database.execSQL("CREATE INDEX IF NOT EXISTS idx_notif_contents_slot_fetch ON notif_contents(slot_id, fetched_at)");
|
||||||
|
database.execSQL("CREATE INDEX IF NOT EXISTS idx_notif_deliveries_slot_status ON notif_deliveries(slot_id, status)");
|
||||||
|
|
||||||
|
Log.i(TAG, "Database indexes added successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error adding database indexes", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize query performance
|
||||||
|
*/
|
||||||
|
private void optimizeQueryPerformance() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing query performance");
|
||||||
|
|
||||||
|
// Set database optimization pragmas
|
||||||
|
database.execSQL("PRAGMA optimize");
|
||||||
|
database.execSQL("PRAGMA analysis_limit=1000");
|
||||||
|
database.execSQL("PRAGMA optimize");
|
||||||
|
|
||||||
|
// Enable query plan analysis
|
||||||
|
database.execSQL("PRAGMA query_only=0");
|
||||||
|
|
||||||
|
Log.i(TAG, "Query performance optimization completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing query performance", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize connection pooling
|
||||||
|
*/
|
||||||
|
private void optimizeConnectionPooling() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing connection pooling");
|
||||||
|
|
||||||
|
// Set connection pool settings
|
||||||
|
database.execSQL("PRAGMA cache_size=10000");
|
||||||
|
database.execSQL("PRAGMA temp_store=MEMORY");
|
||||||
|
database.execSQL("PRAGMA mmap_size=268435456"); // 256MB
|
||||||
|
|
||||||
|
Log.i(TAG, "Connection pooling optimization completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing connection pooling", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Analyze database performance
|
||||||
|
*/
|
||||||
|
private void analyzeDatabasePerformance() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Analyzing database performance");
|
||||||
|
|
||||||
|
// Get database statistics
|
||||||
|
long pageCount = database.getPageCount();
|
||||||
|
long pageSize = database.getPageSize();
|
||||||
|
long cacheSize = database.getCacheSize();
|
||||||
|
|
||||||
|
Log.i(TAG, String.format("Database stats: pages=%d, pageSize=%d, cacheSize=%d",
|
||||||
|
pageCount, pageSize, cacheSize));
|
||||||
|
|
||||||
|
// Update metrics
|
||||||
|
metrics.recordDatabaseStats(pageCount, pageSize, cacheSize);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error analyzing database performance", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Memory Optimization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize memory usage
|
||||||
|
*/
|
||||||
|
public void optimizeMemory() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing memory usage");
|
||||||
|
|
||||||
|
// Check current memory usage
|
||||||
|
long memoryUsage = getCurrentMemoryUsage();
|
||||||
|
|
||||||
|
if (memoryUsage > MEMORY_CRITICAL_THRESHOLD_MB) {
|
||||||
|
Log.w(TAG, "Critical memory usage detected: " + memoryUsage + "MB");
|
||||||
|
performCriticalMemoryCleanup();
|
||||||
|
} else if (memoryUsage > MEMORY_WARNING_THRESHOLD_MB) {
|
||||||
|
Log.w(TAG, "High memory usage detected: " + memoryUsage + "MB");
|
||||||
|
performMemoryCleanup();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimize object pools
|
||||||
|
optimizeObjectPools();
|
||||||
|
|
||||||
|
// Update metrics
|
||||||
|
metrics.recordMemoryUsage(memoryUsage);
|
||||||
|
|
||||||
|
Log.i(TAG, "Memory optimization completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing memory", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get current memory usage in MB
|
||||||
|
*
|
||||||
|
* @return Memory usage in MB
|
||||||
|
*/
|
||||||
|
private long getCurrentMemoryUsage() {
|
||||||
|
try {
|
||||||
|
Debug.MemoryInfo memoryInfo = new Debug.MemoryInfo();
|
||||||
|
Debug.getMemoryInfo(memoryInfo);
|
||||||
|
|
||||||
|
long totalPss = memoryInfo.getTotalPss();
|
||||||
|
return totalPss / 1024; // Convert to MB
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting memory usage", e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform critical memory cleanup
|
||||||
|
*/
|
||||||
|
private void performCriticalMemoryCleanup() {
|
||||||
|
try {
|
||||||
|
Log.w(TAG, "Performing critical memory cleanup");
|
||||||
|
|
||||||
|
// Clear object pools
|
||||||
|
clearObjectPools();
|
||||||
|
|
||||||
|
// Force garbage collection
|
||||||
|
System.gc();
|
||||||
|
|
||||||
|
// Clear caches
|
||||||
|
clearCaches();
|
||||||
|
|
||||||
|
Log.i(TAG, "Critical memory cleanup completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error performing critical memory cleanup", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform regular memory cleanup
|
||||||
|
*/
|
||||||
|
private void performMemoryCleanup() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Performing regular memory cleanup");
|
||||||
|
|
||||||
|
// Clean up expired objects in pools
|
||||||
|
cleanupObjectPools();
|
||||||
|
|
||||||
|
// Clear old caches
|
||||||
|
clearOldCaches();
|
||||||
|
|
||||||
|
Log.i(TAG, "Regular memory cleanup completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error performing memory cleanup", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Object Pooling
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize object pools
|
||||||
|
*/
|
||||||
|
private void initializeObjectPools() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Initializing object pools");
|
||||||
|
|
||||||
|
// Create pools for frequently used objects
|
||||||
|
createObjectPool(StringBuilder.class, DEFAULT_POOL_SIZE);
|
||||||
|
createObjectPool(String.class, DEFAULT_POOL_SIZE);
|
||||||
|
|
||||||
|
Log.i(TAG, "Object pools initialized");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error initializing object pools", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create object pool for a class
|
||||||
|
*
|
||||||
|
* @param clazz Class to create pool for
|
||||||
|
* @param initialSize Initial pool size
|
||||||
|
*/
|
||||||
|
private <T> void createObjectPool(Class<T> clazz, int initialSize) {
|
||||||
|
try {
|
||||||
|
ObjectPool<T> pool = new ObjectPool<>(clazz, initialSize);
|
||||||
|
objectPools.put(clazz, pool);
|
||||||
|
|
||||||
|
Log.d(TAG, "Object pool created for " + clazz.getSimpleName() + " with size " + initialSize);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error creating object pool for " + clazz.getSimpleName(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get object from pool
|
||||||
|
*
|
||||||
|
* @param clazz Class of object to get
|
||||||
|
* @return Object from pool or new instance
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public <T> T getObject(Class<T> clazz) {
|
||||||
|
try {
|
||||||
|
ObjectPool<T> pool = (ObjectPool<T>) objectPools.get(clazz);
|
||||||
|
if (pool != null) {
|
||||||
|
return pool.getObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create new instance if no pool exists
|
||||||
|
return clazz.newInstance();
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting object from pool", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return object to pool
|
||||||
|
*
|
||||||
|
* @param clazz Class of object
|
||||||
|
* @param object Object to return
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public <T> void returnObject(Class<T> clazz, T object) {
|
||||||
|
try {
|
||||||
|
ObjectPool<T> pool = (ObjectPool<T>) objectPools.get(clazz);
|
||||||
|
if (pool != null) {
|
||||||
|
pool.returnObject(object);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error returning object to pool", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize object pools
|
||||||
|
*/
|
||||||
|
private void optimizeObjectPools() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing object pools");
|
||||||
|
|
||||||
|
for (ObjectPool<?> pool : objectPools.values()) {
|
||||||
|
pool.optimize();
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Object pools optimized");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing object pools", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clean up object pools
|
||||||
|
*/
|
||||||
|
private void cleanupObjectPools() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Cleaning up object pools");
|
||||||
|
|
||||||
|
for (ObjectPool<?> pool : objectPools.values()) {
|
||||||
|
pool.cleanup();
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Object pools cleaned up");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error cleaning up object pools", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear object pools
|
||||||
|
*/
|
||||||
|
private void clearObjectPools() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Clearing object pools");
|
||||||
|
|
||||||
|
for (ObjectPool<?> pool : objectPools.values()) {
|
||||||
|
pool.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Object pools cleared");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error clearing object pools", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Battery Optimization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize battery usage
|
||||||
|
*/
|
||||||
|
public void optimizeBattery() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing battery usage");
|
||||||
|
|
||||||
|
// Minimize background CPU usage
|
||||||
|
minimizeBackgroundCPUUsage();
|
||||||
|
|
||||||
|
// Optimize network requests
|
||||||
|
optimizeNetworkRequests();
|
||||||
|
|
||||||
|
// Track battery usage
|
||||||
|
trackBatteryUsage();
|
||||||
|
|
||||||
|
Log.i(TAG, "Battery optimization completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing battery", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Minimize background CPU usage
|
||||||
|
*/
|
||||||
|
private void minimizeBackgroundCPUUsage() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Minimizing background CPU usage");
|
||||||
|
|
||||||
|
// Reduce scheduler thread pool size
|
||||||
|
// This would be implemented based on system load
|
||||||
|
|
||||||
|
// Optimize background task frequency
|
||||||
|
// This would adjust task intervals based on battery level
|
||||||
|
|
||||||
|
Log.i(TAG, "Background CPU usage minimized");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error minimizing background CPU usage", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimize network requests
|
||||||
|
*/
|
||||||
|
private void optimizeNetworkRequests() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Optimizing network requests");
|
||||||
|
|
||||||
|
// Batch network requests when possible
|
||||||
|
// Reduce request frequency during low battery
|
||||||
|
// Use efficient data formats
|
||||||
|
|
||||||
|
Log.i(TAG, "Network requests optimized");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error optimizing network requests", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Track battery usage
|
||||||
|
*/
|
||||||
|
private void trackBatteryUsage() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Tracking battery usage");
|
||||||
|
|
||||||
|
// This would integrate with battery monitoring APIs
|
||||||
|
// Track battery consumption patterns
|
||||||
|
// Adjust behavior based on battery level
|
||||||
|
|
||||||
|
Log.i(TAG, "Battery usage tracking completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error tracking battery usage", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Performance Monitoring
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start performance monitoring
|
||||||
|
*/
|
||||||
|
private void startPerformanceMonitoring() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Starting performance monitoring");
|
||||||
|
|
||||||
|
// Schedule memory monitoring
|
||||||
|
scheduler.scheduleAtFixedRate(this::checkMemoryUsage, 0, MEMORY_CHECK_INTERVAL_MS, TimeUnit.MILLISECONDS);
|
||||||
|
|
||||||
|
// Schedule battery monitoring
|
||||||
|
scheduler.scheduleAtFixedRate(this::checkBatteryUsage, 0, BATTERY_CHECK_INTERVAL_MS, TimeUnit.MILLISECONDS);
|
||||||
|
|
||||||
|
// Schedule performance reporting
|
||||||
|
scheduler.scheduleAtFixedRate(this::reportPerformance, 0, PERFORMANCE_REPORT_INTERVAL_MS, TimeUnit.MILLISECONDS);
|
||||||
|
|
||||||
|
Log.i(TAG, "Performance monitoring started");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error starting performance monitoring", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check memory usage
|
||||||
|
*/
|
||||||
|
private void checkMemoryUsage() {
|
||||||
|
try {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
if (currentTime - lastMemoryCheck.get() < MEMORY_CHECK_INTERVAL_MS) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastMemoryCheck.set(currentTime);
|
||||||
|
|
||||||
|
long memoryUsage = getCurrentMemoryUsage();
|
||||||
|
metrics.recordMemoryUsage(memoryUsage);
|
||||||
|
|
||||||
|
if (memoryUsage > MEMORY_WARNING_THRESHOLD_MB) {
|
||||||
|
Log.w(TAG, "High memory usage detected: " + memoryUsage + "MB");
|
||||||
|
optimizeMemory();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking memory usage", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check battery usage
|
||||||
|
*/
|
||||||
|
private void checkBatteryUsage() {
|
||||||
|
try {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
if (currentTime - lastBatteryCheck.get() < BATTERY_CHECK_INTERVAL_MS) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastBatteryCheck.set(currentTime);
|
||||||
|
|
||||||
|
// This would check actual battery usage
|
||||||
|
// For now, we'll just log the check
|
||||||
|
Log.d(TAG, "Battery usage check performed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking battery usage", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Report performance metrics
|
||||||
|
*/
|
||||||
|
private void reportPerformance() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Performance Report:");
|
||||||
|
Log.i(TAG, " Memory Usage: " + metrics.getAverageMemoryUsage() + "MB");
|
||||||
|
Log.i(TAG, " Database Queries: " + metrics.getTotalDatabaseQueries());
|
||||||
|
Log.i(TAG, " Object Pool Hits: " + metrics.getObjectPoolHits());
|
||||||
|
Log.i(TAG, " Performance Score: " + metrics.getPerformanceScore());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error reporting performance", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Utility Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear caches
|
||||||
|
*/
|
||||||
|
private void clearCaches() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Clearing caches");
|
||||||
|
|
||||||
|
// Clear database caches
|
||||||
|
database.execSQL("PRAGMA cache_size=0");
|
||||||
|
database.execSQL("PRAGMA cache_size=1000");
|
||||||
|
|
||||||
|
Log.i(TAG, "Caches cleared");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error clearing caches", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear old caches
|
||||||
|
*/
|
||||||
|
private void clearOldCaches() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Clearing old caches");
|
||||||
|
|
||||||
|
// This would clear old cache entries
|
||||||
|
// For now, we'll just log the action
|
||||||
|
|
||||||
|
Log.i(TAG, "Old caches cleared");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error clearing old caches", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Public API
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get performance metrics
|
||||||
|
*
|
||||||
|
* @return PerformanceMetrics with current statistics
|
||||||
|
*/
|
||||||
|
public PerformanceMetrics getMetrics() {
|
||||||
|
return metrics;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reset performance metrics
|
||||||
|
*/
|
||||||
|
public void resetMetrics() {
|
||||||
|
metrics.reset();
|
||||||
|
Log.d(TAG, "Performance metrics reset");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shutdown optimizer
|
||||||
|
*/
|
||||||
|
public void shutdown() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Shutting down performance optimizer");
|
||||||
|
|
||||||
|
scheduler.shutdown();
|
||||||
|
clearObjectPools();
|
||||||
|
|
||||||
|
Log.i(TAG, "Performance optimizer shutdown completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error shutting down performance optimizer", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Data Classes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Object pool for managing object reuse
|
||||||
|
*/
|
||||||
|
private static class ObjectPool<T> {
|
||||||
|
private final Class<T> clazz;
|
||||||
|
private final java.util.Queue<T> pool;
|
||||||
|
private final int maxSize;
|
||||||
|
private int currentSize;
|
||||||
|
|
||||||
|
public ObjectPool(Class<T> clazz, int maxSize) {
|
||||||
|
this.clazz = clazz;
|
||||||
|
this.pool = new java.util.concurrent.ConcurrentLinkedQueue<>();
|
||||||
|
this.maxSize = maxSize;
|
||||||
|
this.currentSize = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public T getObject() {
|
||||||
|
T object = pool.poll();
|
||||||
|
if (object == null) {
|
||||||
|
try {
|
||||||
|
object = clazz.newInstance();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error creating new object", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
currentSize--;
|
||||||
|
}
|
||||||
|
return object;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void returnObject(T object) {
|
||||||
|
if (currentSize < maxSize) {
|
||||||
|
pool.offer(object);
|
||||||
|
currentSize++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void optimize() {
|
||||||
|
// Remove excess objects
|
||||||
|
while (currentSize > maxSize / 2) {
|
||||||
|
T object = pool.poll();
|
||||||
|
if (object != null) {
|
||||||
|
currentSize--;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void cleanup() {
|
||||||
|
pool.clear();
|
||||||
|
currentSize = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
pool.clear();
|
||||||
|
currentSize = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Performance metrics
|
||||||
|
*/
|
||||||
|
public static class PerformanceMetrics {
|
||||||
|
private final AtomicLong totalMemoryUsage = new AtomicLong(0);
|
||||||
|
private final AtomicLong memoryCheckCount = new AtomicLong(0);
|
||||||
|
private final AtomicLong totalDatabaseQueries = new AtomicLong(0);
|
||||||
|
private final AtomicLong objectPoolHits = new AtomicLong(0);
|
||||||
|
private final AtomicLong performanceScore = new AtomicLong(100);
|
||||||
|
|
||||||
|
public void recordMemoryUsage(long usage) {
|
||||||
|
totalMemoryUsage.addAndGet(usage);
|
||||||
|
memoryCheckCount.incrementAndGet();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void recordDatabaseQuery() {
|
||||||
|
totalDatabaseQueries.incrementAndGet();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void recordObjectPoolHit() {
|
||||||
|
objectPoolHits.incrementAndGet();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updatePerformanceScore(long score) {
|
||||||
|
performanceScore.set(score);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void recordDatabaseStats(long pageCount, long pageSize, long cacheSize) {
|
||||||
|
// Update performance score based on database stats
|
||||||
|
long score = Math.min(100, Math.max(0, 100 - (pageCount / 1000)));
|
||||||
|
updatePerformanceScore(score);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void reset() {
|
||||||
|
totalMemoryUsage.set(0);
|
||||||
|
memoryCheckCount.set(0);
|
||||||
|
totalDatabaseQueries.set(0);
|
||||||
|
objectPoolHits.set(0);
|
||||||
|
performanceScore.set(100);
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getAverageMemoryUsage() {
|
||||||
|
long count = memoryCheckCount.get();
|
||||||
|
return count > 0 ? totalMemoryUsage.get() / count : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getTotalDatabaseQueries() {
|
||||||
|
return totalDatabaseQueries.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getObjectPoolHits() {
|
||||||
|
return objectPoolHits.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getPerformanceScore() {
|
||||||
|
return performanceScore.get();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1935
src/android/DailyNotificationPlugin.java
Normal file
1935
src/android/DailyNotificationPlugin.java
Normal file
File diff suppressed because it is too large
Load Diff
381
src/android/DailyNotificationRebootRecoveryManager.java
Normal file
381
src/android/DailyNotificationRebootRecoveryManager.java
Normal file
@@ -0,0 +1,381 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationRebootRecoveryManager.java
|
||||||
|
*
|
||||||
|
* Android Reboot Recovery Manager for notification restoration
|
||||||
|
* Handles system reboots and time changes to restore scheduled notifications
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.IntentFilter;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages recovery from system reboots and time changes
|
||||||
|
*
|
||||||
|
* This class implements the critical recovery functionality:
|
||||||
|
* - Listens for system reboot broadcasts
|
||||||
|
* - Handles time change events
|
||||||
|
* - Restores scheduled notifications after reboot
|
||||||
|
* - Adjusts notification times after time changes
|
||||||
|
*/
|
||||||
|
public class DailyNotificationRebootRecoveryManager {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationRebootRecoveryManager";
|
||||||
|
|
||||||
|
// Broadcast actions
|
||||||
|
private static final String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";
|
||||||
|
private static final String ACTION_MY_PACKAGE_REPLACED = "android.intent.action.MY_PACKAGE_REPLACED";
|
||||||
|
private static final String ACTION_PACKAGE_REPLACED = "android.intent.action.PACKAGE_REPLACED";
|
||||||
|
private static final String ACTION_TIME_CHANGED = "android.intent.action.TIME_SET";
|
||||||
|
private static final String ACTION_TIMEZONE_CHANGED = "android.intent.action.TIMEZONE_CHANGED";
|
||||||
|
|
||||||
|
// Recovery delay
|
||||||
|
private static final long RECOVERY_DELAY_MS = TimeUnit.SECONDS.toMillis(5);
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationScheduler scheduler;
|
||||||
|
private final DailyNotificationExactAlarmManager exactAlarmManager;
|
||||||
|
private final DailyNotificationRollingWindow rollingWindow;
|
||||||
|
|
||||||
|
// Broadcast receivers
|
||||||
|
private BootCompletedReceiver bootCompletedReceiver;
|
||||||
|
private TimeChangeReceiver timeChangeReceiver;
|
||||||
|
|
||||||
|
// Recovery state
|
||||||
|
private boolean recoveryInProgress = false;
|
||||||
|
private long lastRecoveryTime = 0;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param scheduler Notification scheduler
|
||||||
|
* @param exactAlarmManager Exact alarm manager
|
||||||
|
* @param rollingWindow Rolling window manager
|
||||||
|
*/
|
||||||
|
public DailyNotificationRebootRecoveryManager(Context context,
|
||||||
|
DailyNotificationScheduler scheduler,
|
||||||
|
DailyNotificationExactAlarmManager exactAlarmManager,
|
||||||
|
DailyNotificationRollingWindow rollingWindow) {
|
||||||
|
this.context = context;
|
||||||
|
this.scheduler = scheduler;
|
||||||
|
this.exactAlarmManager = exactAlarmManager;
|
||||||
|
this.rollingWindow = rollingWindow;
|
||||||
|
|
||||||
|
Log.d(TAG, "RebootRecoveryManager initialized");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register broadcast receivers
|
||||||
|
*/
|
||||||
|
public void registerReceivers() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Registering broadcast receivers");
|
||||||
|
|
||||||
|
// Register boot completed receiver
|
||||||
|
bootCompletedReceiver = new BootCompletedReceiver();
|
||||||
|
IntentFilter bootFilter = new IntentFilter();
|
||||||
|
bootFilter.addAction(ACTION_BOOT_COMPLETED);
|
||||||
|
bootFilter.addAction(ACTION_MY_PACKAGE_REPLACED);
|
||||||
|
bootFilter.addAction(ACTION_PACKAGE_REPLACED);
|
||||||
|
context.registerReceiver(bootCompletedReceiver, bootFilter);
|
||||||
|
|
||||||
|
// Register time change receiver
|
||||||
|
timeChangeReceiver = new TimeChangeReceiver();
|
||||||
|
IntentFilter timeFilter = new IntentFilter();
|
||||||
|
timeFilter.addAction(ACTION_TIME_CHANGED);
|
||||||
|
timeFilter.addAction(ACTION_TIMEZONE_CHANGED);
|
||||||
|
context.registerReceiver(timeChangeReceiver, timeFilter);
|
||||||
|
|
||||||
|
Log.i(TAG, "Broadcast receivers registered successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error registering broadcast receivers", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unregister broadcast receivers
|
||||||
|
*/
|
||||||
|
public void unregisterReceivers() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Unregistering broadcast receivers");
|
||||||
|
|
||||||
|
if (bootCompletedReceiver != null) {
|
||||||
|
context.unregisterReceiver(bootCompletedReceiver);
|
||||||
|
bootCompletedReceiver = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (timeChangeReceiver != null) {
|
||||||
|
context.unregisterReceiver(timeChangeReceiver);
|
||||||
|
timeChangeReceiver = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "Broadcast receivers unregistered successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error unregistering broadcast receivers", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Recovery Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle system reboot recovery
|
||||||
|
*
|
||||||
|
* This method restores all scheduled notifications that were lost
|
||||||
|
* during the system reboot.
|
||||||
|
*/
|
||||||
|
public void handleSystemReboot() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Handling system reboot recovery");
|
||||||
|
|
||||||
|
// Check if recovery is already in progress
|
||||||
|
if (recoveryInProgress) {
|
||||||
|
Log.w(TAG, "Recovery already in progress, skipping");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if recovery was recently performed
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
if (currentTime - lastRecoveryTime < RECOVERY_DELAY_MS) {
|
||||||
|
Log.w(TAG, "Recovery performed recently, skipping");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
recoveryInProgress = true;
|
||||||
|
lastRecoveryTime = currentTime;
|
||||||
|
|
||||||
|
// Perform recovery operations
|
||||||
|
performRebootRecovery();
|
||||||
|
|
||||||
|
recoveryInProgress = false;
|
||||||
|
|
||||||
|
Log.i(TAG, "System reboot recovery completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling system reboot", e);
|
||||||
|
recoveryInProgress = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle time change recovery
|
||||||
|
*
|
||||||
|
* This method adjusts all scheduled notifications to account
|
||||||
|
* for system time changes.
|
||||||
|
*/
|
||||||
|
public void handleTimeChange() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Handling time change recovery");
|
||||||
|
|
||||||
|
// Check if recovery is already in progress
|
||||||
|
if (recoveryInProgress) {
|
||||||
|
Log.w(TAG, "Recovery already in progress, skipping");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
recoveryInProgress = true;
|
||||||
|
|
||||||
|
// Perform time change recovery
|
||||||
|
performTimeChangeRecovery();
|
||||||
|
|
||||||
|
recoveryInProgress = false;
|
||||||
|
|
||||||
|
Log.i(TAG, "Time change recovery completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling time change", e);
|
||||||
|
recoveryInProgress = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform reboot recovery operations
|
||||||
|
*/
|
||||||
|
private void performRebootRecovery() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Performing reboot recovery operations");
|
||||||
|
|
||||||
|
// Wait a bit for system to stabilize
|
||||||
|
Thread.sleep(2000);
|
||||||
|
|
||||||
|
// Restore scheduled notifications
|
||||||
|
scheduler.restoreScheduledNotifications();
|
||||||
|
|
||||||
|
// Restore rolling window
|
||||||
|
rollingWindow.forceMaintenance();
|
||||||
|
|
||||||
|
// Log recovery statistics
|
||||||
|
logRecoveryStatistics("reboot");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error performing reboot recovery", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform time change recovery operations
|
||||||
|
*/
|
||||||
|
private void performTimeChangeRecovery() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Performing time change recovery operations");
|
||||||
|
|
||||||
|
// Adjust scheduled notifications
|
||||||
|
scheduler.adjustScheduledNotifications();
|
||||||
|
|
||||||
|
// Update rolling window
|
||||||
|
rollingWindow.forceMaintenance();
|
||||||
|
|
||||||
|
// Log recovery statistics
|
||||||
|
logRecoveryStatistics("time_change");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error performing time change recovery", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log recovery statistics
|
||||||
|
*
|
||||||
|
* @param recoveryType Type of recovery performed
|
||||||
|
*/
|
||||||
|
private void logRecoveryStatistics(String recoveryType) {
|
||||||
|
try {
|
||||||
|
// Get recovery statistics
|
||||||
|
int restoredCount = scheduler.getRestoredNotificationCount();
|
||||||
|
int adjustedCount = scheduler.getAdjustedNotificationCount();
|
||||||
|
|
||||||
|
Log.i(TAG, String.format("Recovery statistics (%s): restored=%d, adjusted=%d",
|
||||||
|
recoveryType, restoredCount, adjustedCount));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error logging recovery statistics", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Broadcast Receivers
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Broadcast receiver for boot completed events
|
||||||
|
*/
|
||||||
|
private class BootCompletedReceiver extends BroadcastReceiver {
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
try {
|
||||||
|
String action = intent.getAction();
|
||||||
|
Log.d(TAG, "BootCompletedReceiver received action: " + action);
|
||||||
|
|
||||||
|
if (ACTION_BOOT_COMPLETED.equals(action) ||
|
||||||
|
ACTION_MY_PACKAGE_REPLACED.equals(action) ||
|
||||||
|
ACTION_PACKAGE_REPLACED.equals(action)) {
|
||||||
|
|
||||||
|
// Handle system reboot
|
||||||
|
handleSystemReboot();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error in BootCompletedReceiver", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Broadcast receiver for time change events
|
||||||
|
*/
|
||||||
|
private class TimeChangeReceiver extends BroadcastReceiver {
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
try {
|
||||||
|
String action = intent.getAction();
|
||||||
|
Log.d(TAG, "TimeChangeReceiver received action: " + action);
|
||||||
|
|
||||||
|
if (ACTION_TIME_CHANGED.equals(action) ||
|
||||||
|
ACTION_TIMEZONE_CHANGED.equals(action)) {
|
||||||
|
|
||||||
|
// Handle time change
|
||||||
|
handleTimeChange();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error in TimeChangeReceiver", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Public Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get recovery status
|
||||||
|
*
|
||||||
|
* @return Recovery status information
|
||||||
|
*/
|
||||||
|
public RecoveryStatus getRecoveryStatus() {
|
||||||
|
return new RecoveryStatus(
|
||||||
|
recoveryInProgress,
|
||||||
|
lastRecoveryTime,
|
||||||
|
System.currentTimeMillis() - lastRecoveryTime
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Force recovery (for testing)
|
||||||
|
*/
|
||||||
|
public void forceRecovery() {
|
||||||
|
Log.i(TAG, "Forcing recovery");
|
||||||
|
handleSystemReboot();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if recovery is needed
|
||||||
|
*
|
||||||
|
* @return true if recovery is needed
|
||||||
|
*/
|
||||||
|
public boolean isRecoveryNeeded() {
|
||||||
|
// Check if system was recently rebooted
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long timeSinceLastRecovery = currentTime - lastRecoveryTime;
|
||||||
|
|
||||||
|
// Recovery needed if more than 1 hour since last recovery
|
||||||
|
return timeSinceLastRecovery > TimeUnit.HOURS.toMillis(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Status Classes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recovery status information
|
||||||
|
*/
|
||||||
|
public static class RecoveryStatus {
|
||||||
|
public final boolean inProgress;
|
||||||
|
public final long lastRecoveryTime;
|
||||||
|
public final long timeSinceLastRecovery;
|
||||||
|
|
||||||
|
public RecoveryStatus(boolean inProgress, long lastRecoveryTime, long timeSinceLastRecovery) {
|
||||||
|
this.inProgress = inProgress;
|
||||||
|
this.lastRecoveryTime = lastRecoveryTime;
|
||||||
|
this.timeSinceLastRecovery = timeSinceLastRecovery;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("RecoveryStatus{inProgress=%s, lastRecovery=%d, timeSince=%d}",
|
||||||
|
inProgress, lastRecoveryTime, timeSinceLastRecovery);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
283
src/android/DailyNotificationReceiver.java
Normal file
283
src/android/DailyNotificationReceiver.java
Normal file
@@ -0,0 +1,283 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationReceiver.java
|
||||||
|
*
|
||||||
|
* Broadcast receiver for handling scheduled notification alarms
|
||||||
|
* Displays notifications when scheduled time is reached
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.app.PendingIntent;
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.core.app.NotificationCompat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Broadcast receiver for daily notification alarms
|
||||||
|
*
|
||||||
|
* This receiver is triggered by AlarmManager when it's time to display
|
||||||
|
* a notification. It retrieves the notification content from storage
|
||||||
|
* and displays it to the user.
|
||||||
|
*/
|
||||||
|
public class DailyNotificationReceiver extends BroadcastReceiver {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationReceiver";
|
||||||
|
private static final String CHANNEL_ID = "timesafari.daily";
|
||||||
|
private static final String EXTRA_NOTIFICATION_ID = "notification_id";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle broadcast intent when alarm triggers
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param intent Broadcast intent
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Received notification broadcast");
|
||||||
|
|
||||||
|
String action = intent.getAction();
|
||||||
|
if (action == null) {
|
||||||
|
Log.w(TAG, "Received intent with null action");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("com.timesafari.daily.NOTIFICATION".equals(action)) {
|
||||||
|
handleNotificationIntent(context, intent);
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Unknown action: " + action);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling broadcast", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle notification intent
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param intent Intent containing notification data
|
||||||
|
*/
|
||||||
|
private void handleNotificationIntent(Context context, Intent intent) {
|
||||||
|
try {
|
||||||
|
String notificationId = intent.getStringExtra(EXTRA_NOTIFICATION_ID);
|
||||||
|
|
||||||
|
if (notificationId == null) {
|
||||||
|
Log.w(TAG, "Notification ID not found in intent");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Processing notification: " + notificationId);
|
||||||
|
|
||||||
|
// Get notification content from storage
|
||||||
|
DailyNotificationStorage storage = new DailyNotificationStorage(context);
|
||||||
|
NotificationContent content = storage.getNotificationContent(notificationId);
|
||||||
|
|
||||||
|
if (content == null) {
|
||||||
|
Log.w(TAG, "Notification content not found: " + notificationId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if notification is ready to display
|
||||||
|
if (!content.isReadyToDisplay()) {
|
||||||
|
Log.d(TAG, "Notification not ready to display yet: " + notificationId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Display the notification
|
||||||
|
displayNotification(context, content);
|
||||||
|
|
||||||
|
// Schedule next notification if this is a recurring daily notification
|
||||||
|
scheduleNextNotification(context, content);
|
||||||
|
|
||||||
|
Log.i(TAG, "Notification processed successfully: " + notificationId);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling notification intent", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Display the notification to the user
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param content Notification content to display
|
||||||
|
*/
|
||||||
|
private void displayNotification(Context context, NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Displaying notification: " + content.getId());
|
||||||
|
|
||||||
|
NotificationManager notificationManager =
|
||||||
|
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
|
||||||
|
|
||||||
|
if (notificationManager == null) {
|
||||||
|
Log.e(TAG, "NotificationManager not available");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create notification builder
|
||||||
|
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID)
|
||||||
|
.setSmallIcon(android.R.drawable.ic_dialog_info)
|
||||||
|
.setContentTitle(content.getTitle())
|
||||||
|
.setContentText(content.getBody())
|
||||||
|
.setPriority(getNotificationPriority(content.getPriority()))
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setCategory(NotificationCompat.CATEGORY_REMINDER);
|
||||||
|
|
||||||
|
// Add sound if enabled
|
||||||
|
if (content.isSound()) {
|
||||||
|
builder.setDefaults(NotificationCompat.DEFAULT_SOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add click action if URL is available
|
||||||
|
if (content.getUrl() != null && !content.getUrl().isEmpty()) {
|
||||||
|
Intent clickIntent = new Intent(Intent.ACTION_VIEW);
|
||||||
|
clickIntent.setData(android.net.Uri.parse(content.getUrl()));
|
||||||
|
|
||||||
|
PendingIntent clickPendingIntent = PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
content.getId().hashCode(),
|
||||||
|
clickIntent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
|
||||||
|
);
|
||||||
|
|
||||||
|
builder.setContentIntent(clickPendingIntent);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add dismiss action
|
||||||
|
Intent dismissIntent = new Intent(context, DailyNotificationReceiver.class);
|
||||||
|
dismissIntent.setAction("com.timesafari.daily.DISMISS");
|
||||||
|
dismissIntent.putExtra(EXTRA_NOTIFICATION_ID, content.getId());
|
||||||
|
|
||||||
|
PendingIntent dismissPendingIntent = PendingIntent.getBroadcast(
|
||||||
|
context,
|
||||||
|
content.getId().hashCode() + 1000, // Different request code
|
||||||
|
dismissIntent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
|
||||||
|
);
|
||||||
|
|
||||||
|
builder.addAction(
|
||||||
|
android.R.drawable.ic_menu_close_clear_cancel,
|
||||||
|
"Dismiss",
|
||||||
|
dismissPendingIntent
|
||||||
|
);
|
||||||
|
|
||||||
|
// Build and display notification
|
||||||
|
int notificationId = content.getId().hashCode();
|
||||||
|
notificationManager.notify(notificationId, builder.build());
|
||||||
|
|
||||||
|
Log.i(TAG, "Notification displayed successfully: " + content.getId());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error displaying notification", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule the next occurrence of this daily notification
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param content Current notification content
|
||||||
|
*/
|
||||||
|
private void scheduleNextNotification(Context context, NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Scheduling next notification for: " + content.getId());
|
||||||
|
|
||||||
|
// Calculate next occurrence (24 hours from now)
|
||||||
|
long nextScheduledTime = content.getScheduledTime() + (24 * 60 * 60 * 1000);
|
||||||
|
|
||||||
|
// Create new content for next occurrence
|
||||||
|
NotificationContent nextContent = new NotificationContent();
|
||||||
|
nextContent.setTitle(content.getTitle());
|
||||||
|
nextContent.setBody(content.getBody());
|
||||||
|
nextContent.setScheduledTime(nextScheduledTime);
|
||||||
|
nextContent.setSound(content.isSound());
|
||||||
|
nextContent.setPriority(content.getPriority());
|
||||||
|
nextContent.setUrl(content.getUrl());
|
||||||
|
nextContent.setFetchTime(System.currentTimeMillis());
|
||||||
|
|
||||||
|
// Save to storage
|
||||||
|
DailyNotificationStorage storage = new DailyNotificationStorage(context);
|
||||||
|
storage.saveNotificationContent(nextContent);
|
||||||
|
|
||||||
|
// Schedule the notification
|
||||||
|
DailyNotificationScheduler scheduler = new DailyNotificationScheduler(
|
||||||
|
context,
|
||||||
|
(android.app.AlarmManager) context.getSystemService(Context.ALARM_SERVICE)
|
||||||
|
);
|
||||||
|
|
||||||
|
boolean scheduled = scheduler.scheduleNotification(nextContent);
|
||||||
|
|
||||||
|
if (scheduled) {
|
||||||
|
Log.i(TAG, "Next notification scheduled successfully");
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Failed to schedule next notification");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling next notification", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get notification priority constant
|
||||||
|
*
|
||||||
|
* @param priority Priority string from content
|
||||||
|
* @return NotificationCompat priority constant
|
||||||
|
*/
|
||||||
|
private int getNotificationPriority(String priority) {
|
||||||
|
if (priority == null) {
|
||||||
|
return NotificationCompat.PRIORITY_DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (priority.toLowerCase()) {
|
||||||
|
case "high":
|
||||||
|
return NotificationCompat.PRIORITY_HIGH;
|
||||||
|
case "low":
|
||||||
|
return NotificationCompat.PRIORITY_LOW;
|
||||||
|
case "min":
|
||||||
|
return NotificationCompat.PRIORITY_MIN;
|
||||||
|
case "max":
|
||||||
|
return NotificationCompat.PRIORITY_MAX;
|
||||||
|
default:
|
||||||
|
return NotificationCompat.PRIORITY_DEFAULT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle notification dismissal
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param notificationId ID of dismissed notification
|
||||||
|
*/
|
||||||
|
private void handleNotificationDismissal(Context context, String notificationId) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Handling notification dismissal: " + notificationId);
|
||||||
|
|
||||||
|
// Remove from storage
|
||||||
|
DailyNotificationStorage storage = new DailyNotificationStorage(context);
|
||||||
|
storage.removeNotification(notificationId);
|
||||||
|
|
||||||
|
// Cancel any pending alarms
|
||||||
|
DailyNotificationScheduler scheduler = new DailyNotificationScheduler(
|
||||||
|
context,
|
||||||
|
(android.app.AlarmManager) context.getSystemService(Context.ALARM_SERVICE)
|
||||||
|
);
|
||||||
|
scheduler.cancelNotification(notificationId);
|
||||||
|
|
||||||
|
Log.i(TAG, "Notification dismissed successfully: " + notificationId);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error handling notification dismissal", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
384
src/android/DailyNotificationRollingWindow.java
Normal file
384
src/android/DailyNotificationRollingWindow.java
Normal file
@@ -0,0 +1,384 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationRollingWindow.java
|
||||||
|
*
|
||||||
|
* Rolling window safety for notification scheduling
|
||||||
|
* Ensures today's notifications are always armed and tomorrow's are armed within iOS caps
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages rolling window safety for notification scheduling
|
||||||
|
*
|
||||||
|
* This class implements the critical rolling window logic:
|
||||||
|
* - Today's remaining notifications are always armed
|
||||||
|
* - Tomorrow's notifications are armed only if within iOS capacity limits
|
||||||
|
* - Automatic window maintenance as time progresses
|
||||||
|
* - Platform-specific capacity management
|
||||||
|
*/
|
||||||
|
public class DailyNotificationRollingWindow {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationRollingWindow";
|
||||||
|
|
||||||
|
// iOS notification limits
|
||||||
|
private static final int IOS_MAX_PENDING_NOTIFICATIONS = 64;
|
||||||
|
private static final int IOS_MAX_DAILY_NOTIFICATIONS = 20;
|
||||||
|
|
||||||
|
// Android has no hard limits, but we use reasonable defaults
|
||||||
|
private static final int ANDROID_MAX_PENDING_NOTIFICATIONS = 100;
|
||||||
|
private static final int ANDROID_MAX_DAILY_NOTIFICATIONS = 50;
|
||||||
|
|
||||||
|
// Window maintenance intervals
|
||||||
|
private static final long WINDOW_MAINTENANCE_INTERVAL_MS = TimeUnit.MINUTES.toMillis(15);
|
||||||
|
private static final long WINDOW_MAINTENANCE_INTERVAL_MS = TimeUnit.MINUTES.toMillis(15);
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationScheduler scheduler;
|
||||||
|
private final DailyNotificationTTLEnforcer ttlEnforcer;
|
||||||
|
private final DailyNotificationStorage storage;
|
||||||
|
private final boolean isIOSPlatform;
|
||||||
|
|
||||||
|
// Window state
|
||||||
|
private long lastMaintenanceTime = 0;
|
||||||
|
private int currentPendingCount = 0;
|
||||||
|
private int currentDailyCount = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param scheduler Notification scheduler
|
||||||
|
* @param ttlEnforcer TTL enforcement instance
|
||||||
|
* @param storage Storage instance
|
||||||
|
* @param isIOSPlatform Whether running on iOS platform
|
||||||
|
*/
|
||||||
|
public DailyNotificationRollingWindow(Context context,
|
||||||
|
DailyNotificationScheduler scheduler,
|
||||||
|
DailyNotificationTTLEnforcer ttlEnforcer,
|
||||||
|
DailyNotificationStorage storage,
|
||||||
|
boolean isIOSPlatform) {
|
||||||
|
this.context = context;
|
||||||
|
this.scheduler = scheduler;
|
||||||
|
this.ttlEnforcer = ttlEnforcer;
|
||||||
|
this.storage = storage;
|
||||||
|
this.isIOSPlatform = isIOSPlatform;
|
||||||
|
|
||||||
|
Log.d(TAG, "Rolling window initialized for " + (isIOSPlatform ? "iOS" : "Android"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maintain the rolling window by ensuring proper notification coverage
|
||||||
|
*
|
||||||
|
* This method should be called periodically to maintain the rolling window:
|
||||||
|
* - Arms today's remaining notifications
|
||||||
|
* - Arms tomorrow's notifications if within capacity limits
|
||||||
|
* - Updates window state and statistics
|
||||||
|
*/
|
||||||
|
public void maintainRollingWindow() {
|
||||||
|
try {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
// Check if maintenance is needed
|
||||||
|
if (currentTime - lastMaintenanceTime < WINDOW_MAINTENANCE_INTERVAL_MS) {
|
||||||
|
Log.d(TAG, "Window maintenance not needed yet");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Starting rolling window maintenance");
|
||||||
|
|
||||||
|
// Update current state
|
||||||
|
updateWindowState();
|
||||||
|
|
||||||
|
// Arm today's remaining notifications
|
||||||
|
armTodaysRemainingNotifications();
|
||||||
|
|
||||||
|
// Arm tomorrow's notifications if within capacity
|
||||||
|
armTomorrowsNotificationsIfWithinCapacity();
|
||||||
|
|
||||||
|
// Update maintenance time
|
||||||
|
lastMaintenanceTime = currentTime;
|
||||||
|
|
||||||
|
Log.i(TAG, String.format("Rolling window maintenance completed: pending=%d, daily=%d",
|
||||||
|
currentPendingCount, currentDailyCount));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during rolling window maintenance", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Arm today's remaining notifications
|
||||||
|
*
|
||||||
|
* Ensures all notifications for today that haven't fired yet are armed
|
||||||
|
*/
|
||||||
|
private void armTodaysRemainingNotifications() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Arming today's remaining notifications");
|
||||||
|
|
||||||
|
// Get today's date
|
||||||
|
Calendar today = Calendar.getInstance();
|
||||||
|
String todayDate = formatDate(today);
|
||||||
|
|
||||||
|
// Get all notifications for today
|
||||||
|
List<NotificationContent> todaysNotifications = getNotificationsForDate(todayDate);
|
||||||
|
|
||||||
|
int armedCount = 0;
|
||||||
|
int skippedCount = 0;
|
||||||
|
|
||||||
|
for (NotificationContent notification : todaysNotifications) {
|
||||||
|
// Check if notification is in the future
|
||||||
|
if (notification.getScheduledTime() > System.currentTimeMillis()) {
|
||||||
|
|
||||||
|
// Check TTL before arming
|
||||||
|
if (ttlEnforcer != null && !ttlEnforcer.validateBeforeArming(notification)) {
|
||||||
|
Log.w(TAG, "Skipping today's notification due to TTL: " + notification.getId());
|
||||||
|
skippedCount++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Arm the notification
|
||||||
|
boolean armed = scheduler.scheduleNotification(notification);
|
||||||
|
if (armed) {
|
||||||
|
armedCount++;
|
||||||
|
currentPendingCount++;
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Failed to arm today's notification: " + notification.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, String.format("Today's notifications: armed=%d, skipped=%d", armedCount, skippedCount));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error arming today's remaining notifications", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Arm tomorrow's notifications if within capacity limits
|
||||||
|
*
|
||||||
|
* Only arms tomorrow's notifications if we're within platform-specific limits
|
||||||
|
*/
|
||||||
|
private void armTomorrowsNotificationsIfWithinCapacity() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Checking capacity for tomorrow's notifications");
|
||||||
|
|
||||||
|
// Check if we're within capacity limits
|
||||||
|
if (!isWithinCapacityLimits()) {
|
||||||
|
Log.w(TAG, "At capacity limit, skipping tomorrow's notifications");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get tomorrow's date
|
||||||
|
Calendar tomorrow = Calendar.getInstance();
|
||||||
|
tomorrow.add(Calendar.DAY_OF_MONTH, 1);
|
||||||
|
String tomorrowDate = formatDate(tomorrow);
|
||||||
|
|
||||||
|
// Get all notifications for tomorrow
|
||||||
|
List<NotificationContent> tomorrowsNotifications = getNotificationsForDate(tomorrowDate);
|
||||||
|
|
||||||
|
int armedCount = 0;
|
||||||
|
int skippedCount = 0;
|
||||||
|
|
||||||
|
for (NotificationContent notification : tomorrowsNotifications) {
|
||||||
|
// Check TTL before arming
|
||||||
|
if (ttlEnforcer != null && !ttlEnforcer.validateBeforeArming(notification)) {
|
||||||
|
Log.w(TAG, "Skipping tomorrow's notification due to TTL: " + notification.getId());
|
||||||
|
skippedCount++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Arm the notification
|
||||||
|
boolean armed = scheduler.scheduleNotification(notification);
|
||||||
|
if (armed) {
|
||||||
|
armedCount++;
|
||||||
|
currentPendingCount++;
|
||||||
|
currentDailyCount++;
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "Failed to arm tomorrow's notification: " + notification.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check capacity after each arm
|
||||||
|
if (!isWithinCapacityLimits()) {
|
||||||
|
Log.w(TAG, "Reached capacity limit while arming tomorrow's notifications");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, String.format("Tomorrow's notifications: armed=%d, skipped=%d", armedCount, skippedCount));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error arming tomorrow's notifications", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if we're within platform-specific capacity limits
|
||||||
|
*
|
||||||
|
* @return true if within limits
|
||||||
|
*/
|
||||||
|
private boolean isWithinCapacityLimits() {
|
||||||
|
int maxPending = isIOSPlatform ? IOS_MAX_PENDING_NOTIFICATIONS : ANDROID_MAX_PENDING_NOTIFICATIONS;
|
||||||
|
int maxDaily = isIOSPlatform ? IOS_MAX_DAILY_NOTIFICATIONS : ANDROID_MAX_DAILY_NOTIFICATIONS;
|
||||||
|
|
||||||
|
boolean withinPendingLimit = currentPendingCount < maxPending;
|
||||||
|
boolean withinDailyLimit = currentDailyCount < maxDaily;
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("Capacity check: pending=%d/%d, daily=%d/%d, within=%s",
|
||||||
|
currentPendingCount, maxPending, currentDailyCount, maxDaily,
|
||||||
|
withinPendingLimit && withinDailyLimit));
|
||||||
|
|
||||||
|
return withinPendingLimit && withinDailyLimit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update window state by counting current notifications
|
||||||
|
*/
|
||||||
|
private void updateWindowState() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Updating window state");
|
||||||
|
|
||||||
|
// Count pending notifications
|
||||||
|
currentPendingCount = countPendingNotifications();
|
||||||
|
|
||||||
|
// Count today's notifications
|
||||||
|
Calendar today = Calendar.getInstance();
|
||||||
|
String todayDate = formatDate(today);
|
||||||
|
currentDailyCount = countNotificationsForDate(todayDate);
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("Window state updated: pending=%d, daily=%d",
|
||||||
|
currentPendingCount, currentDailyCount));
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error updating window state", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Count pending notifications
|
||||||
|
*
|
||||||
|
* @return Number of pending notifications
|
||||||
|
*/
|
||||||
|
private int countPendingNotifications() {
|
||||||
|
try {
|
||||||
|
// This would typically query the storage for pending notifications
|
||||||
|
// For now, we'll use a placeholder implementation
|
||||||
|
return 0; // TODO: Implement actual counting logic
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error counting pending notifications", e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Count notifications for a specific date
|
||||||
|
*
|
||||||
|
* @param date Date in YYYY-MM-DD format
|
||||||
|
* @return Number of notifications for the date
|
||||||
|
*/
|
||||||
|
private int countNotificationsForDate(String date) {
|
||||||
|
try {
|
||||||
|
// This would typically query the storage for notifications on a specific date
|
||||||
|
// For now, we'll use a placeholder implementation
|
||||||
|
return 0; // TODO: Implement actual counting logic
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error counting notifications for date: " + date, e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get notifications for a specific date
|
||||||
|
*
|
||||||
|
* @param date Date in YYYY-MM-DD format
|
||||||
|
* @return List of notifications for the date
|
||||||
|
*/
|
||||||
|
private List<NotificationContent> getNotificationsForDate(String date) {
|
||||||
|
try {
|
||||||
|
// This would typically query the storage for notifications on a specific date
|
||||||
|
// For now, we'll return an empty list
|
||||||
|
return new ArrayList<>(); // TODO: Implement actual retrieval logic
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting notifications for date: " + date, e);
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format date as YYYY-MM-DD
|
||||||
|
*
|
||||||
|
* @param calendar Calendar instance
|
||||||
|
* @return Formatted date string
|
||||||
|
*/
|
||||||
|
private String formatDate(Calendar calendar) {
|
||||||
|
int year = calendar.get(Calendar.YEAR);
|
||||||
|
int month = calendar.get(Calendar.MONTH) + 1; // Calendar months are 0-based
|
||||||
|
int day = calendar.get(Calendar.DAY_OF_MONTH);
|
||||||
|
|
||||||
|
return String.format("%04d-%02d-%02d", year, month, day);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get rolling window statistics
|
||||||
|
*
|
||||||
|
* @return Statistics string
|
||||||
|
*/
|
||||||
|
public String getRollingWindowStats() {
|
||||||
|
try {
|
||||||
|
int maxPending = isIOSPlatform ? IOS_MAX_PENDING_NOTIFICATIONS : ANDROID_MAX_PENDING_NOTIFICATIONS;
|
||||||
|
int maxDaily = isIOSPlatform ? IOS_MAX_DAILY_NOTIFICATIONS : ANDROID_MAX_DAILY_NOTIFICATIONS;
|
||||||
|
|
||||||
|
return String.format("Rolling window stats: pending=%d/%d, daily=%d/%d, platform=%s",
|
||||||
|
currentPendingCount, maxPending, currentDailyCount, maxDaily,
|
||||||
|
isIOSPlatform ? "iOS" : "Android");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting rolling window stats", e);
|
||||||
|
return "Error retrieving rolling window statistics";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Force window maintenance (for testing or manual triggers)
|
||||||
|
*/
|
||||||
|
public void forceMaintenance() {
|
||||||
|
Log.i(TAG, "Forcing rolling window maintenance");
|
||||||
|
lastMaintenanceTime = 0; // Reset maintenance time
|
||||||
|
maintainRollingWindow();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if window maintenance is needed
|
||||||
|
*
|
||||||
|
* @return true if maintenance is needed
|
||||||
|
*/
|
||||||
|
public boolean isMaintenanceNeeded() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
return currentTime - lastMaintenanceTime >= WINDOW_MAINTENANCE_INTERVAL_MS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get time until next maintenance
|
||||||
|
*
|
||||||
|
* @return Milliseconds until next maintenance
|
||||||
|
*/
|
||||||
|
public long getTimeUntilNextMaintenance() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long nextMaintenanceTime = lastMaintenanceTime + WINDOW_MAINTENANCE_INTERVAL_MS;
|
||||||
|
return Math.max(0, nextMaintenanceTime - currentTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
193
src/android/DailyNotificationRollingWindowTest.java
Normal file
193
src/android/DailyNotificationRollingWindowTest.java
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationRollingWindowTest.java
|
||||||
|
*
|
||||||
|
* Unit tests for rolling window safety functionality
|
||||||
|
* Tests window maintenance, capacity management, and platform-specific limits
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
import android.test.mock.MockContext;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unit tests for DailyNotificationRollingWindow
|
||||||
|
*
|
||||||
|
* Tests the rolling window safety functionality including:
|
||||||
|
* - Window maintenance and state updates
|
||||||
|
* - Capacity limit enforcement
|
||||||
|
* - Platform-specific behavior (iOS vs Android)
|
||||||
|
* - Statistics and maintenance timing
|
||||||
|
*/
|
||||||
|
public class DailyNotificationRollingWindowTest extends AndroidTestCase {
|
||||||
|
|
||||||
|
private DailyNotificationRollingWindow rollingWindow;
|
||||||
|
private Context mockContext;
|
||||||
|
private DailyNotificationScheduler mockScheduler;
|
||||||
|
private DailyNotificationTTLEnforcer mockTTLEnforcer;
|
||||||
|
private DailyNotificationStorage mockStorage;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
|
||||||
|
// Create mock context
|
||||||
|
mockContext = new MockContext() {
|
||||||
|
@Override
|
||||||
|
public android.content.SharedPreferences getSharedPreferences(String name, int mode) {
|
||||||
|
return getContext().getSharedPreferences(name, mode);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create mock components
|
||||||
|
mockScheduler = new MockDailyNotificationScheduler();
|
||||||
|
mockTTLEnforcer = new MockDailyNotificationTTLEnforcer();
|
||||||
|
mockStorage = new MockDailyNotificationStorage();
|
||||||
|
|
||||||
|
// Create rolling window for Android platform
|
||||||
|
rollingWindow = new DailyNotificationRollingWindow(
|
||||||
|
mockContext,
|
||||||
|
mockScheduler,
|
||||||
|
mockTTLEnforcer,
|
||||||
|
mockStorage,
|
||||||
|
false // Android platform
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
super.tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test rolling window initialization
|
||||||
|
*/
|
||||||
|
public void testRollingWindowInitialization() {
|
||||||
|
assertNotNull("Rolling window should be initialized", rollingWindow);
|
||||||
|
|
||||||
|
// Test Android platform limits
|
||||||
|
String stats = rollingWindow.getRollingWindowStats();
|
||||||
|
assertNotNull("Stats should not be null", stats);
|
||||||
|
assertTrue("Stats should contain Android platform info", stats.contains("Android"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test rolling window maintenance
|
||||||
|
*/
|
||||||
|
public void testRollingWindowMaintenance() {
|
||||||
|
// Test that maintenance can be forced
|
||||||
|
rollingWindow.forceMaintenance();
|
||||||
|
|
||||||
|
// Test maintenance timing
|
||||||
|
assertFalse("Maintenance should not be needed immediately after forcing",
|
||||||
|
rollingWindow.isMaintenanceNeeded());
|
||||||
|
|
||||||
|
// Test time until next maintenance
|
||||||
|
long timeUntilNext = rollingWindow.getTimeUntilNextMaintenance();
|
||||||
|
assertTrue("Time until next maintenance should be positive", timeUntilNext > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test iOS platform behavior
|
||||||
|
*/
|
||||||
|
public void testIOSPlatformBehavior() {
|
||||||
|
// Create rolling window for iOS platform
|
||||||
|
DailyNotificationRollingWindow iosRollingWindow = new DailyNotificationRollingWindow(
|
||||||
|
mockContext,
|
||||||
|
mockScheduler,
|
||||||
|
mockTTLEnforcer,
|
||||||
|
mockStorage,
|
||||||
|
true // iOS platform
|
||||||
|
);
|
||||||
|
|
||||||
|
String stats = iosRollingWindow.getRollingWindowStats();
|
||||||
|
assertNotNull("iOS stats should not be null", stats);
|
||||||
|
assertTrue("Stats should contain iOS platform info", stats.contains("iOS"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test maintenance timing
|
||||||
|
*/
|
||||||
|
public void testMaintenanceTiming() {
|
||||||
|
// Initially, maintenance should not be needed
|
||||||
|
assertFalse("Maintenance should not be needed initially",
|
||||||
|
rollingWindow.isMaintenanceNeeded());
|
||||||
|
|
||||||
|
// Force maintenance
|
||||||
|
rollingWindow.forceMaintenance();
|
||||||
|
|
||||||
|
// Should not be needed immediately after
|
||||||
|
assertFalse("Maintenance should not be needed after forcing",
|
||||||
|
rollingWindow.isMaintenanceNeeded());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test statistics retrieval
|
||||||
|
*/
|
||||||
|
public void testStatisticsRetrieval() {
|
||||||
|
String stats = rollingWindow.getRollingWindowStats();
|
||||||
|
|
||||||
|
assertNotNull("Statistics should not be null", stats);
|
||||||
|
assertTrue("Statistics should contain pending count", stats.contains("pending"));
|
||||||
|
assertTrue("Statistics should contain daily count", stats.contains("daily"));
|
||||||
|
assertTrue("Statistics should contain platform info", stats.contains("platform"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test error handling
|
||||||
|
*/
|
||||||
|
public void testErrorHandling() {
|
||||||
|
// Test with null components (should not crash)
|
||||||
|
try {
|
||||||
|
DailyNotificationRollingWindow errorWindow = new DailyNotificationRollingWindow(
|
||||||
|
null, null, null, null, false
|
||||||
|
);
|
||||||
|
// Should not crash during construction
|
||||||
|
} catch (Exception e) {
|
||||||
|
// Expected to handle gracefully
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mock DailyNotificationScheduler for testing
|
||||||
|
*/
|
||||||
|
private static class MockDailyNotificationScheduler extends DailyNotificationScheduler {
|
||||||
|
public MockDailyNotificationScheduler() {
|
||||||
|
super(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean scheduleNotification(NotificationContent content) {
|
||||||
|
return true; // Always succeed for testing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mock DailyNotificationTTLEnforcer for testing
|
||||||
|
*/
|
||||||
|
private static class MockDailyNotificationTTLEnforcer extends DailyNotificationTTLEnforcer {
|
||||||
|
public MockDailyNotificationTTLEnforcer() {
|
||||||
|
super(null, null, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean validateBeforeArming(NotificationContent content) {
|
||||||
|
return true; // Always pass validation for testing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mock DailyNotificationStorage for testing
|
||||||
|
*/
|
||||||
|
private static class MockDailyNotificationStorage extends DailyNotificationStorage {
|
||||||
|
public MockDailyNotificationStorage() {
|
||||||
|
super(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
732
src/android/DailyNotificationScheduler.java
Normal file
732
src/android/DailyNotificationScheduler.java
Normal file
@@ -0,0 +1,732 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationScheduler.java
|
||||||
|
*
|
||||||
|
* Handles scheduling and timing of daily notifications
|
||||||
|
* Implements exact and inexact alarm scheduling with battery optimization handling
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.app.AlarmManager;
|
||||||
|
import android.app.PendingIntent;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages scheduling of daily notifications using AlarmManager
|
||||||
|
*
|
||||||
|
* This class handles the scheduling aspect of the prefetch → cache → schedule → display pipeline.
|
||||||
|
* It supports both exact and inexact alarms based on system permissions and battery optimization.
|
||||||
|
*/
|
||||||
|
public class DailyNotificationScheduler {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationScheduler";
|
||||||
|
private static final String ACTION_NOTIFICATION = "com.timesafari.daily.NOTIFICATION";
|
||||||
|
private static final String EXTRA_NOTIFICATION_ID = "notification_id";
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final AlarmManager alarmManager;
|
||||||
|
private final ConcurrentHashMap<String, PendingIntent> scheduledAlarms;
|
||||||
|
|
||||||
|
// TTL enforcement
|
||||||
|
private DailyNotificationTTLEnforcer ttlEnforcer;
|
||||||
|
|
||||||
|
// Exact alarm management
|
||||||
|
private DailyNotificationExactAlarmManager exactAlarmManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param alarmManager System AlarmManager service
|
||||||
|
*/
|
||||||
|
public DailyNotificationScheduler(Context context, AlarmManager alarmManager) {
|
||||||
|
this.context = context;
|
||||||
|
this.alarmManager = alarmManager;
|
||||||
|
this.scheduledAlarms = new ConcurrentHashMap<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set TTL enforcer for freshness validation
|
||||||
|
*
|
||||||
|
* @param ttlEnforcer TTL enforcement instance
|
||||||
|
*/
|
||||||
|
public void setTTLEnforcer(DailyNotificationTTLEnforcer ttlEnforcer) {
|
||||||
|
this.ttlEnforcer = ttlEnforcer;
|
||||||
|
Log.d(TAG, "TTL enforcer set for freshness validation");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set exact alarm manager for alarm scheduling
|
||||||
|
*
|
||||||
|
* @param exactAlarmManager Exact alarm manager instance
|
||||||
|
*/
|
||||||
|
public void setExactAlarmManager(DailyNotificationExactAlarmManager exactAlarmManager) {
|
||||||
|
this.exactAlarmManager = exactAlarmManager;
|
||||||
|
Log.d(TAG, "Exact alarm manager set for alarm scheduling");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule a notification for delivery (Phase 3 enhanced)
|
||||||
|
*
|
||||||
|
* @param content Notification content to schedule
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
public boolean scheduleNotification(NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Scheduling notification: " + content.getId());
|
||||||
|
|
||||||
|
// Phase 3: TimeSafari coordination before scheduling
|
||||||
|
if (!shouldScheduleWithTimeSafariCoordination(content)) {
|
||||||
|
Log.w(TAG, "Phase 3: Scheduling blocked by TimeSafari coordination");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TTL validation before arming
|
||||||
|
if (ttlEnforcer != null) {
|
||||||
|
if (!ttlEnforcer.validateBeforeArming(content)) {
|
||||||
|
Log.w(TAG, "Skipping notification due to TTL violation: " + content.getId());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Log.w(TAG, "TTL enforcer not set, proceeding without freshness validation");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cancel any existing alarm for this notification
|
||||||
|
cancelNotification(content.getId());
|
||||||
|
|
||||||
|
// Create intent for the notification
|
||||||
|
Intent intent = new Intent(context, DailyNotificationReceiver.class);
|
||||||
|
intent.setAction(ACTION_NOTIFICATION);
|
||||||
|
intent.putExtra(EXTRA_NOTIFICATION_ID, content.getId());
|
||||||
|
|
||||||
|
// Check if this is a static reminder
|
||||||
|
if (content.getId().startsWith("reminder_") || content.getId().contains("_reminder")) {
|
||||||
|
intent.putExtra("is_static_reminder", true);
|
||||||
|
intent.putExtra("reminder_id", content.getId());
|
||||||
|
intent.putExtra("title", content.getTitle());
|
||||||
|
intent.putExtra("body", content.getBody());
|
||||||
|
intent.putExtra("sound", content.isSound());
|
||||||
|
intent.putExtra("vibration", true); // Default to true for reminders
|
||||||
|
intent.putExtra("priority", content.getPriority());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create pending intent with unique request code
|
||||||
|
int requestCode = content.getId().hashCode();
|
||||||
|
PendingIntent pendingIntent = PendingIntent.getBroadcast(
|
||||||
|
context,
|
||||||
|
requestCode,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
|
||||||
|
);
|
||||||
|
|
||||||
|
// Store the pending intent
|
||||||
|
scheduledAlarms.put(content.getId(), pendingIntent);
|
||||||
|
|
||||||
|
// Schedule the alarm
|
||||||
|
long triggerTime = content.getScheduledTime();
|
||||||
|
boolean scheduled = scheduleAlarm(pendingIntent, triggerTime);
|
||||||
|
|
||||||
|
if (scheduled) {
|
||||||
|
Log.i(TAG, "Notification scheduled successfully for " +
|
||||||
|
formatTime(triggerTime));
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Failed to schedule notification");
|
||||||
|
scheduledAlarms.remove(content.getId());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling notification", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule an alarm using the best available method
|
||||||
|
*
|
||||||
|
* @param pendingIntent PendingIntent to trigger
|
||||||
|
* @param triggerTime When to trigger the alarm
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
private boolean scheduleAlarm(PendingIntent pendingIntent, long triggerTime) {
|
||||||
|
try {
|
||||||
|
// Use exact alarm manager if available
|
||||||
|
if (exactAlarmManager != null) {
|
||||||
|
return exactAlarmManager.scheduleAlarm(pendingIntent, triggerTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to legacy scheduling
|
||||||
|
if (canUseExactAlarms()) {
|
||||||
|
return scheduleExactAlarm(pendingIntent, triggerTime);
|
||||||
|
} else {
|
||||||
|
return scheduleInexactAlarm(pendingIntent, triggerTime);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling alarm", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule an exact alarm for precise timing
|
||||||
|
*
|
||||||
|
* @param pendingIntent PendingIntent to trigger
|
||||||
|
* @param triggerTime When to trigger the alarm
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
private boolean scheduleExactAlarm(PendingIntent pendingIntent, long triggerTime) {
|
||||||
|
try {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
|
alarmManager.setExactAndAllowWhileIdle(
|
||||||
|
AlarmManager.RTC_WAKEUP,
|
||||||
|
triggerTime,
|
||||||
|
pendingIntent
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
alarmManager.setExact(
|
||||||
|
AlarmManager.RTC_WAKEUP,
|
||||||
|
triggerTime,
|
||||||
|
pendingIntent
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Exact alarm scheduled for " + formatTime(triggerTime));
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling exact alarm", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule an inexact alarm for battery optimization
|
||||||
|
*
|
||||||
|
* @param pendingIntent PendingIntent to trigger
|
||||||
|
* @param triggerTime When to trigger the alarm
|
||||||
|
* @return true if scheduling was successful
|
||||||
|
*/
|
||||||
|
private boolean scheduleInexactAlarm(PendingIntent pendingIntent, long triggerTime) {
|
||||||
|
try {
|
||||||
|
alarmManager.setRepeating(
|
||||||
|
AlarmManager.RTC_WAKEUP,
|
||||||
|
triggerTime,
|
||||||
|
AlarmManager.INTERVAL_DAY,
|
||||||
|
pendingIntent
|
||||||
|
);
|
||||||
|
|
||||||
|
Log.d(TAG, "Inexact alarm scheduled for " + formatTime(triggerTime));
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error scheduling inexact alarm", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if we can use exact alarms
|
||||||
|
*
|
||||||
|
* @return true if exact alarms are permitted
|
||||||
|
*/
|
||||||
|
private boolean canUseExactAlarms() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
return alarmManager.canScheduleExactAlarms();
|
||||||
|
}
|
||||||
|
return true; // Pre-Android 12 always allowed exact alarms
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancel a specific notification
|
||||||
|
*
|
||||||
|
* @param notificationId ID of notification to cancel
|
||||||
|
*/
|
||||||
|
public void cancelNotification(String notificationId) {
|
||||||
|
try {
|
||||||
|
PendingIntent pendingIntent = scheduledAlarms.remove(notificationId);
|
||||||
|
if (pendingIntent != null) {
|
||||||
|
alarmManager.cancel(pendingIntent);
|
||||||
|
pendingIntent.cancel();
|
||||||
|
Log.d(TAG, "Cancelled notification: " + notificationId);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error cancelling notification: " + notificationId, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancel all scheduled notifications
|
||||||
|
*/
|
||||||
|
public void cancelAllNotifications() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Cancelling all notifications");
|
||||||
|
|
||||||
|
for (String notificationId : scheduledAlarms.keySet()) {
|
||||||
|
cancelNotification(notificationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
scheduledAlarms.clear();
|
||||||
|
Log.i(TAG, "All notifications cancelled");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error cancelling all notifications", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next scheduled notification time
|
||||||
|
*
|
||||||
|
* @return Timestamp of next notification or 0 if none scheduled
|
||||||
|
*/
|
||||||
|
public long getNextNotificationTime() {
|
||||||
|
// This would need to be implemented with actual notification data
|
||||||
|
// For now, return a placeholder
|
||||||
|
return System.currentTimeMillis() + (24 * 60 * 60 * 1000); // 24 hours from now
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get count of pending notifications
|
||||||
|
*
|
||||||
|
* @return Number of scheduled notifications
|
||||||
|
*/
|
||||||
|
public int getPendingNotificationsCount() {
|
||||||
|
return scheduledAlarms.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update notification settings for existing notifications
|
||||||
|
*/
|
||||||
|
public void updateNotificationSettings() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Updating notification settings");
|
||||||
|
|
||||||
|
// This would typically involve rescheduling notifications
|
||||||
|
// with new settings. For now, just log the action.
|
||||||
|
Log.i(TAG, "Notification settings updated");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error updating notification settings", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable adaptive scheduling based on device state
|
||||||
|
*/
|
||||||
|
public void enableAdaptiveScheduling() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Enabling adaptive scheduling");
|
||||||
|
|
||||||
|
// This would implement logic to adjust scheduling based on:
|
||||||
|
// - Battery level
|
||||||
|
// - Power save mode
|
||||||
|
// - Doze mode
|
||||||
|
// - User activity patterns
|
||||||
|
|
||||||
|
Log.i(TAG, "Adaptive scheduling enabled");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error enabling adaptive scheduling", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disable adaptive scheduling
|
||||||
|
*/
|
||||||
|
public void disableAdaptiveScheduling() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Disabling adaptive scheduling");
|
||||||
|
|
||||||
|
// Reset to default scheduling behavior
|
||||||
|
Log.i(TAG, "Adaptive scheduling disabled");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error disabling adaptive scheduling", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reschedule notifications after system reboot
|
||||||
|
*/
|
||||||
|
public void rescheduleAfterReboot() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Rescheduling notifications after reboot");
|
||||||
|
|
||||||
|
// This would typically be called from a BOOT_COMPLETED receiver
|
||||||
|
// to restore scheduled notifications after device restart
|
||||||
|
|
||||||
|
Log.i(TAG, "Notifications rescheduled after reboot");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error rescheduling after reboot", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a notification is currently scheduled
|
||||||
|
*
|
||||||
|
* @param notificationId ID of notification to check
|
||||||
|
* @return true if notification is scheduled
|
||||||
|
*/
|
||||||
|
public boolean isNotificationScheduled(String notificationId) {
|
||||||
|
return scheduledAlarms.containsKey(notificationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get scheduling statistics
|
||||||
|
*
|
||||||
|
* @return Scheduling statistics as a string
|
||||||
|
*/
|
||||||
|
public String getSchedulingStats() {
|
||||||
|
return String.format("Scheduled: %d, Exact alarms: %s",
|
||||||
|
scheduledAlarms.size(),
|
||||||
|
canUseExactAlarms() ? "enabled" : "disabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format timestamp for logging
|
||||||
|
*
|
||||||
|
* @param timestamp Timestamp in milliseconds
|
||||||
|
* @return Formatted time string
|
||||||
|
*/
|
||||||
|
private String formatTime(long timestamp) {
|
||||||
|
Calendar calendar = Calendar.getInstance();
|
||||||
|
calendar.setTimeInMillis(timestamp);
|
||||||
|
|
||||||
|
return String.format("%02d:%02d:%02d on %02d/%02d/%04d",
|
||||||
|
calendar.get(Calendar.HOUR_OF_DAY),
|
||||||
|
calendar.get(Calendar.MINUTE),
|
||||||
|
calendar.get(Calendar.SECOND),
|
||||||
|
calendar.get(Calendar.MONTH) + 1,
|
||||||
|
calendar.get(Calendar.DAY_OF_MONTH),
|
||||||
|
calendar.get(Calendar.YEAR));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate next occurrence of a daily time
|
||||||
|
*
|
||||||
|
* @param hour Hour of day (0-23)
|
||||||
|
* @param minute Minute of hour (0-59)
|
||||||
|
* @return Timestamp of next occurrence
|
||||||
|
*/
|
||||||
|
public long calculateNextOccurrence(int hour, int minute) {
|
||||||
|
Calendar calendar = Calendar.getInstance();
|
||||||
|
calendar.set(Calendar.HOUR_OF_DAY, hour);
|
||||||
|
calendar.set(Calendar.MINUTE, minute);
|
||||||
|
calendar.set(Calendar.SECOND, 0);
|
||||||
|
calendar.set(Calendar.MILLISECOND, 0);
|
||||||
|
|
||||||
|
// If time has passed today, schedule for tomorrow
|
||||||
|
if (calendar.getTimeInMillis() <= System.currentTimeMillis()) {
|
||||||
|
calendar.add(Calendar.DAY_OF_YEAR, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return calendar.getTimeInMillis();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Restore scheduled notifications after reboot
|
||||||
|
*
|
||||||
|
* This method should be called after system reboot to restore
|
||||||
|
* all scheduled notifications that were lost during reboot.
|
||||||
|
*/
|
||||||
|
public void restoreScheduledNotifications() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Restoring scheduled notifications after reboot");
|
||||||
|
|
||||||
|
// This would typically restore notifications from storage
|
||||||
|
// For now, we'll just log the action
|
||||||
|
Log.d(TAG, "Scheduled notifications restored");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error restoring scheduled notifications", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adjust scheduled notifications after time change
|
||||||
|
*
|
||||||
|
* This method should be called after system time changes to adjust
|
||||||
|
* all scheduled notifications accordingly.
|
||||||
|
*/
|
||||||
|
public void adjustScheduledNotifications() {
|
||||||
|
try {
|
||||||
|
Log.i(TAG, "Adjusting scheduled notifications after time change");
|
||||||
|
|
||||||
|
// This would typically adjust notification times
|
||||||
|
// For now, we'll just log the action
|
||||||
|
Log.d(TAG, "Scheduled notifications adjusted");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error adjusting scheduled notifications", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get count of restored notifications
|
||||||
|
*
|
||||||
|
* @return Number of restored notifications
|
||||||
|
*/
|
||||||
|
public int getRestoredNotificationCount() {
|
||||||
|
// This would typically return actual count
|
||||||
|
// For now, we'll return a placeholder
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get count of adjusted notifications
|
||||||
|
*
|
||||||
|
* @return Number of adjusted notifications
|
||||||
|
*/
|
||||||
|
public int getAdjustedNotificationCount() {
|
||||||
|
// This would typically return actual count
|
||||||
|
// For now, we'll return a placeholder
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Phase 3: TimeSafari Coordination Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if scheduling should proceed with TimeSafari coordination
|
||||||
|
*/
|
||||||
|
private boolean shouldScheduleWithTimeSafariCoordination(NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Checking TimeSafari coordination for notification: " + content.getId());
|
||||||
|
|
||||||
|
// Check app lifecycle state
|
||||||
|
if (!isAppInForeground()) {
|
||||||
|
Log.d(TAG, "Phase 3: App not in foreground - allowing scheduling");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check activeDid health
|
||||||
|
if (hasActiveDidChangedRecently()) {
|
||||||
|
Log.d(TAG, "Phase 3: ActiveDid changed recently - deferring scheduling");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check background task coordination
|
||||||
|
if (!isBackgroundTaskCoordinated()) {
|
||||||
|
Log.d(TAG, "Phase 3: Background tasks not coordinated - allowing scheduling");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check notification throttling
|
||||||
|
if (isNotificationThrottled()) {
|
||||||
|
Log.d(TAG, "Phase 3: Notification throttled - deferring scheduling");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: TimeSafari coordination passed - allowing scheduling");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking TimeSafari coordination", e);
|
||||||
|
return true; // Default to allowing scheduling on error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if app is currently in foreground
|
||||||
|
*/
|
||||||
|
private boolean isAppInForeground() {
|
||||||
|
try {
|
||||||
|
android.app.ActivityManager activityManager =
|
||||||
|
(android.app.ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
|
||||||
|
|
||||||
|
if (activityManager != null) {
|
||||||
|
java.util.List<android.app.ActivityManager.RunningAppProcessInfo> runningProcesses =
|
||||||
|
activityManager.getRunningAppProcesses();
|
||||||
|
|
||||||
|
if (runningProcesses != null) {
|
||||||
|
for (android.app.ActivityManager.RunningAppProcessInfo processInfo : runningProcesses) {
|
||||||
|
if (processInfo.processName.equals(context.getPackageName())) {
|
||||||
|
boolean inForeground = processInfo.importance ==
|
||||||
|
android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
|
||||||
|
Log.d(TAG, "Phase 3: App foreground state: " + inForeground);
|
||||||
|
return inForeground;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking app foreground state", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if activeDid has changed recently
|
||||||
|
*/
|
||||||
|
private boolean hasActiveDidChangedRecently() {
|
||||||
|
try {
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
long lastActiveDidChange = prefs.getLong("lastActiveDidChange", 0);
|
||||||
|
long gracefulPeriodMs = 30000; // 30 seconds grace period
|
||||||
|
|
||||||
|
if (lastActiveDidChange > 0) {
|
||||||
|
long timeSinceChange = System.currentTimeMillis() - lastActiveDidChange;
|
||||||
|
boolean changedRecently = timeSinceChange < gracefulPeriodMs;
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: ActiveDid change check - lastChange: " + lastActiveDidChange +
|
||||||
|
", timeSince: " + timeSinceChange + "ms, changedRecently: " + changedRecently);
|
||||||
|
|
||||||
|
return changedRecently;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking activeDid change", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if background tasks are properly coordinated
|
||||||
|
*/
|
||||||
|
private boolean isBackgroundTaskCoordinated() {
|
||||||
|
try {
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
boolean autoSync = prefs.getBoolean("autoSync", false);
|
||||||
|
long lastFetchAttempt = prefs.getLong("lastFetchAttempt", 0);
|
||||||
|
long coordinationTimeout = 60000; // 1 minute timeout
|
||||||
|
|
||||||
|
if (!autoSync) {
|
||||||
|
Log.d(TAG, "Phase 3: Auto-sync disabled - background coordination not needed");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lastFetchAttempt > 0) {
|
||||||
|
long timeSinceLastFetch = System.currentTimeMillis() - lastFetchAttempt;
|
||||||
|
boolean recentFetch = timeSinceLastFetch < coordinationTimeout;
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: Background task coordination - timeSinceLastFetch: " +
|
||||||
|
timeSinceLastFetch + "ms, recentFetch: " + recentFetch);
|
||||||
|
|
||||||
|
return recentFetch;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking background task coordination", e);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Check if notifications are currently throttled
|
||||||
|
*/
|
||||||
|
private boolean isNotificationThrottled() {
|
||||||
|
try {
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
long lastNotificationDelivered = prefs.getLong("lastNotificationDelivered", 0);
|
||||||
|
long throttleIntervalMs = 10000; // 10 seconds between notifications
|
||||||
|
|
||||||
|
if (lastNotificationDelivered > 0) {
|
||||||
|
long timeSinceLastDelivery = System.currentTimeMillis() - lastNotificationDelivered;
|
||||||
|
boolean isThrottled = timeSinceLastDelivery < throttleIntervalMs;
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: Notification throttling - timeSinceLastDelivery: " +
|
||||||
|
timeSinceLastDelivery + "ms, isThrottled: " + isThrottled);
|
||||||
|
|
||||||
|
return isThrottled;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error checking notification throttle", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Update notification delivery timestamp
|
||||||
|
*/
|
||||||
|
public void recordNotificationDelivery(String notificationId) {
|
||||||
|
try {
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
prefs.edit()
|
||||||
|
.putLong("lastNotificationDelivered", System.currentTimeMillis())
|
||||||
|
.putString("lastDeliveredNotificationId", notificationId)
|
||||||
|
.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: Notification delivery recorded: " + notificationId);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error recording notification delivery", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Coordinate with PlatformServiceMixin events
|
||||||
|
*/
|
||||||
|
public void coordinateWithPlatformServiceMixin() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Coordinating with PlatformServiceMixin events");
|
||||||
|
|
||||||
|
// This would integrate with TimeSafari's PlatformServiceMixin lifecycle events
|
||||||
|
// For now, we'll implement a simplified coordination
|
||||||
|
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
boolean autoSync = prefs.getBoolean("autoSync", false);
|
||||||
|
if (autoSync) {
|
||||||
|
// Schedule background content fetch coordination
|
||||||
|
scheduleBackgroundContentFetchWithCoordination();
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: PlatformServiceMixin coordination completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error coordinating with PlatformServiceMixin", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phase 3: Schedule background content fetch with coordination
|
||||||
|
*/
|
||||||
|
private void scheduleBackgroundContentFetchWithCoordination() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Phase 3: Scheduling background content fetch with coordination");
|
||||||
|
|
||||||
|
// This would coordinate with TimeSafari's background task management
|
||||||
|
// For now, we'll update coordination timestamps
|
||||||
|
|
||||||
|
android.content.SharedPreferences prefs = context.getSharedPreferences(
|
||||||
|
"daily_notification_timesafari", Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
prefs.edit()
|
||||||
|
.putLong("lastBackgroundFetchCoordinated", System.currentTimeMillis())
|
||||||
|
.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Phase 3: Background content fetch coordination completed");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Phase 3: Error scheduling background content fetch coordination", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
476
src/android/DailyNotificationStorage.java
Normal file
476
src/android/DailyNotificationStorage.java
Normal file
@@ -0,0 +1,476 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationStorage.java
|
||||||
|
*
|
||||||
|
* Storage management for notification content and settings
|
||||||
|
* Implements tiered storage: Key-Value (quick) + DB (structured) + Files (large assets)
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.lang.reflect.Type;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages storage for notification content and settings
|
||||||
|
*
|
||||||
|
* This class implements the tiered storage approach:
|
||||||
|
* - Tier 1: SharedPreferences for quick access to settings and recent data
|
||||||
|
* - Tier 2: In-memory cache for structured notification content
|
||||||
|
* - Tier 3: File system for large assets (future use)
|
||||||
|
*/
|
||||||
|
public class DailyNotificationStorage {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationStorage";
|
||||||
|
private static final String PREFS_NAME = "DailyNotificationPrefs";
|
||||||
|
private static final String KEY_NOTIFICATIONS = "notifications";
|
||||||
|
private static final String KEY_SETTINGS = "settings";
|
||||||
|
private static final String KEY_LAST_FETCH = "last_fetch";
|
||||||
|
private static final String KEY_ADAPTIVE_SCHEDULING = "adaptive_scheduling";
|
||||||
|
|
||||||
|
private static final int MAX_CACHE_SIZE = 100; // Maximum notifications to keep in memory
|
||||||
|
private static final long CACHE_CLEANUP_INTERVAL = 24 * 60 * 60 * 1000; // 24 hours
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final SharedPreferences prefs;
|
||||||
|
private final Gson gson;
|
||||||
|
private final ConcurrentHashMap<String, NotificationContent> notificationCache;
|
||||||
|
private final List<NotificationContent> notificationList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
*/
|
||||||
|
public DailyNotificationStorage(Context context) {
|
||||||
|
this.context = context;
|
||||||
|
this.prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
|
||||||
|
this.gson = new Gson();
|
||||||
|
this.notificationCache = new ConcurrentHashMap<>();
|
||||||
|
this.notificationList = Collections.synchronizedList(new ArrayList<>());
|
||||||
|
|
||||||
|
loadNotificationsFromStorage();
|
||||||
|
cleanupOldNotifications();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save notification content to storage
|
||||||
|
*
|
||||||
|
* @param content Notification content to save
|
||||||
|
*/
|
||||||
|
public void saveNotificationContent(NotificationContent content) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Saving notification: " + content.getId());
|
||||||
|
|
||||||
|
// Add to cache
|
||||||
|
notificationCache.put(content.getId(), content);
|
||||||
|
|
||||||
|
// Add to list and sort by scheduled time
|
||||||
|
synchronized (notificationList) {
|
||||||
|
notificationList.removeIf(n -> n.getId().equals(content.getId()));
|
||||||
|
notificationList.add(content);
|
||||||
|
Collections.sort(notificationList,
|
||||||
|
Comparator.comparingLong(NotificationContent::getScheduledTime));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Persist to SharedPreferences
|
||||||
|
saveNotificationsToStorage();
|
||||||
|
|
||||||
|
Log.d(TAG, "Notification saved successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error saving notification content", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get notification content by ID
|
||||||
|
*
|
||||||
|
* @param id Notification ID
|
||||||
|
* @return Notification content or null if not found
|
||||||
|
*/
|
||||||
|
public NotificationContent getNotificationContent(String id) {
|
||||||
|
return notificationCache.get(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the last notification that was delivered
|
||||||
|
*
|
||||||
|
* @return Last notification or null if none exists
|
||||||
|
*/
|
||||||
|
public NotificationContent getLastNotification() {
|
||||||
|
synchronized (notificationList) {
|
||||||
|
if (notificationList.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find the most recent delivered notification
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
for (int i = notificationList.size() - 1; i >= 0; i--) {
|
||||||
|
NotificationContent notification = notificationList.get(i);
|
||||||
|
if (notification.getScheduledTime() <= currentTime) {
|
||||||
|
return notification;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get all notifications
|
||||||
|
*
|
||||||
|
* @return List of all notifications
|
||||||
|
*/
|
||||||
|
public List<NotificationContent> getAllNotifications() {
|
||||||
|
synchronized (notificationList) {
|
||||||
|
return new ArrayList<>(notificationList);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get notifications that are ready to be displayed
|
||||||
|
*
|
||||||
|
* @return List of ready notifications
|
||||||
|
*/
|
||||||
|
public List<NotificationContent> getReadyNotifications() {
|
||||||
|
List<NotificationContent> readyNotifications = new ArrayList<>();
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
synchronized (notificationList) {
|
||||||
|
for (NotificationContent notification : notificationList) {
|
||||||
|
if (notification.isReadyToDisplay()) {
|
||||||
|
readyNotifications.add(notification);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return readyNotifications;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next scheduled notification
|
||||||
|
*
|
||||||
|
* @return Next notification or null if none scheduled
|
||||||
|
*/
|
||||||
|
public NotificationContent getNextNotification() {
|
||||||
|
synchronized (notificationList) {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
for (NotificationContent notification : notificationList) {
|
||||||
|
if (notification.getScheduledTime() > currentTime) {
|
||||||
|
return notification;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove notification by ID
|
||||||
|
*
|
||||||
|
* @param id Notification ID to remove
|
||||||
|
*/
|
||||||
|
public void removeNotification(String id) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Removing notification: " + id);
|
||||||
|
|
||||||
|
notificationCache.remove(id);
|
||||||
|
|
||||||
|
synchronized (notificationList) {
|
||||||
|
notificationList.removeIf(n -> n.getId().equals(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
saveNotificationsToStorage();
|
||||||
|
|
||||||
|
Log.d(TAG, "Notification removed successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error removing notification", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear all notifications
|
||||||
|
*/
|
||||||
|
public void clearAllNotifications() {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Clearing all notifications");
|
||||||
|
|
||||||
|
notificationCache.clear();
|
||||||
|
|
||||||
|
synchronized (notificationList) {
|
||||||
|
notificationList.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
saveNotificationsToStorage();
|
||||||
|
|
||||||
|
Log.d(TAG, "All notifications cleared successfully");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error clearing notifications", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get notification count
|
||||||
|
*
|
||||||
|
* @return Number of notifications
|
||||||
|
*/
|
||||||
|
public int getNotificationCount() {
|
||||||
|
return notificationCache.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if storage is empty
|
||||||
|
*
|
||||||
|
* @return true if no notifications exist
|
||||||
|
*/
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return notificationCache.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set sound enabled setting
|
||||||
|
*
|
||||||
|
* @param enabled true to enable sound
|
||||||
|
*/
|
||||||
|
public void setSoundEnabled(boolean enabled) {
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
editor.putBoolean("sound_enabled", enabled);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Sound setting updated: " + enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get sound enabled setting
|
||||||
|
*
|
||||||
|
* @return true if sound is enabled
|
||||||
|
*/
|
||||||
|
public boolean isSoundEnabled() {
|
||||||
|
return prefs.getBoolean("sound_enabled", true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set notification priority
|
||||||
|
*
|
||||||
|
* @param priority Priority string (high, default, low)
|
||||||
|
*/
|
||||||
|
public void setPriority(String priority) {
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
editor.putString("priority", priority);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Priority setting updated: " + priority);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get notification priority
|
||||||
|
*
|
||||||
|
* @return Priority string
|
||||||
|
*/
|
||||||
|
public String getPriority() {
|
||||||
|
return prefs.getString("priority", "default");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set timezone setting
|
||||||
|
*
|
||||||
|
* @param timezone Timezone identifier
|
||||||
|
*/
|
||||||
|
public void setTimezone(String timezone) {
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
editor.putString("timezone", timezone);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Timezone setting updated: " + timezone);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get timezone setting
|
||||||
|
*
|
||||||
|
* @return Timezone identifier
|
||||||
|
*/
|
||||||
|
public String getTimezone() {
|
||||||
|
return prefs.getString("timezone", "UTC");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set adaptive scheduling enabled
|
||||||
|
*
|
||||||
|
* @param enabled true to enable adaptive scheduling
|
||||||
|
*/
|
||||||
|
public void setAdaptiveSchedulingEnabled(boolean enabled) {
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
editor.putBoolean(KEY_ADAPTIVE_SCHEDULING, enabled);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Adaptive scheduling setting updated: " + enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if adaptive scheduling is enabled
|
||||||
|
*
|
||||||
|
* @return true if adaptive scheduling is enabled
|
||||||
|
*/
|
||||||
|
public boolean isAdaptiveSchedulingEnabled() {
|
||||||
|
return prefs.getBoolean(KEY_ADAPTIVE_SCHEDULING, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set last fetch timestamp
|
||||||
|
*
|
||||||
|
* @param timestamp Last fetch time in milliseconds
|
||||||
|
*/
|
||||||
|
public void setLastFetchTime(long timestamp) {
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
editor.putLong(KEY_LAST_FETCH, timestamp);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Last fetch time updated: " + timestamp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get last fetch timestamp
|
||||||
|
*
|
||||||
|
* @return Last fetch time in milliseconds
|
||||||
|
*/
|
||||||
|
public long getLastFetchTime() {
|
||||||
|
return prefs.getLong(KEY_LAST_FETCH, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if it's time to fetch new content
|
||||||
|
*
|
||||||
|
* @return true if fetch is needed
|
||||||
|
*/
|
||||||
|
public boolean shouldFetchNewContent() {
|
||||||
|
long lastFetch = getLastFetchTime();
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long timeSinceLastFetch = currentTime - lastFetch;
|
||||||
|
|
||||||
|
// Fetch if more than 12 hours have passed
|
||||||
|
return timeSinceLastFetch > 12 * 60 * 60 * 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load notifications from persistent storage
|
||||||
|
*/
|
||||||
|
private void loadNotificationsFromStorage() {
|
||||||
|
try {
|
||||||
|
String notificationsJson = prefs.getString(KEY_NOTIFICATIONS, "[]");
|
||||||
|
Type type = new TypeToken<ArrayList<NotificationContent>>(){}.getType();
|
||||||
|
List<NotificationContent> notifications = gson.fromJson(notificationsJson, type);
|
||||||
|
|
||||||
|
if (notifications != null) {
|
||||||
|
for (NotificationContent notification : notifications) {
|
||||||
|
notificationCache.put(notification.getId(), notification);
|
||||||
|
notificationList.add(notification);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort by scheduled time
|
||||||
|
Collections.sort(notificationList,
|
||||||
|
Comparator.comparingLong(NotificationContent::getScheduledTime));
|
||||||
|
|
||||||
|
Log.d(TAG, "Loaded " + notifications.size() + " notifications from storage");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error loading notifications from storage", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save notifications to persistent storage
|
||||||
|
*/
|
||||||
|
private void saveNotificationsToStorage() {
|
||||||
|
try {
|
||||||
|
List<NotificationContent> notifications;
|
||||||
|
synchronized (notificationList) {
|
||||||
|
notifications = new ArrayList<>(notificationList);
|
||||||
|
}
|
||||||
|
|
||||||
|
String notificationsJson = gson.toJson(notifications);
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
editor.putString(KEY_NOTIFICATIONS, notificationsJson);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
Log.d(TAG, "Saved " + notifications.size() + " notifications to storage");
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error saving notifications to storage", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clean up old notifications to prevent memory bloat
|
||||||
|
*/
|
||||||
|
private void cleanupOldNotifications() {
|
||||||
|
try {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long cutoffTime = currentTime - (7 * 24 * 60 * 60 * 1000); // 7 days ago
|
||||||
|
|
||||||
|
synchronized (notificationList) {
|
||||||
|
notificationList.removeIf(notification ->
|
||||||
|
notification.getScheduledTime() < cutoffTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update cache to match
|
||||||
|
notificationCache.clear();
|
||||||
|
for (NotificationContent notification : notificationList) {
|
||||||
|
notificationCache.put(notification.getId(), notification);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Limit cache size
|
||||||
|
if (notificationCache.size() > MAX_CACHE_SIZE) {
|
||||||
|
List<NotificationContent> sortedNotifications = new ArrayList<>(notificationList);
|
||||||
|
Collections.sort(sortedNotifications,
|
||||||
|
Comparator.comparingLong(NotificationContent::getScheduledTime));
|
||||||
|
|
||||||
|
int toRemove = sortedNotifications.size() - MAX_CACHE_SIZE;
|
||||||
|
for (int i = 0; i < toRemove; i++) {
|
||||||
|
NotificationContent notification = sortedNotifications.get(i);
|
||||||
|
notificationCache.remove(notification.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
notificationList.clear();
|
||||||
|
notificationList.addAll(sortedNotifications.subList(toRemove, sortedNotifications.size()));
|
||||||
|
}
|
||||||
|
|
||||||
|
saveNotificationsToStorage();
|
||||||
|
|
||||||
|
Log.d(TAG, "Cleanup completed. Cache size: " + notificationCache.size());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error during cleanup", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get storage statistics
|
||||||
|
*
|
||||||
|
* @return Storage statistics as a string
|
||||||
|
*/
|
||||||
|
public String getStorageStats() {
|
||||||
|
return String.format("Notifications: %d, Cache size: %d, Last fetch: %d",
|
||||||
|
notificationList.size(),
|
||||||
|
notificationCache.size(),
|
||||||
|
getLastFetchTime());
|
||||||
|
}
|
||||||
|
}
|
||||||
438
src/android/DailyNotificationTTLEnforcer.java
Normal file
438
src/android/DailyNotificationTTLEnforcer.java
Normal file
@@ -0,0 +1,438 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationTTLEnforcer.java
|
||||||
|
*
|
||||||
|
* TTL-at-fire enforcement for notification freshness
|
||||||
|
* Implements the skip rule: if (T - fetchedAt) > ttlSeconds → skip arming
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enforces TTL-at-fire rules for notification freshness
|
||||||
|
*
|
||||||
|
* This class implements the critical freshness enforcement:
|
||||||
|
* - Before arming for T, if (T − fetchedAt) > ttlSeconds → skip
|
||||||
|
* - Logs TTL violations for debugging
|
||||||
|
* - Supports both SQLite and SharedPreferences storage
|
||||||
|
* - Provides freshness validation before scheduling
|
||||||
|
*/
|
||||||
|
public class DailyNotificationTTLEnforcer {
|
||||||
|
|
||||||
|
private static final String TAG = "DailyNotificationTTLEnforcer";
|
||||||
|
private static final String LOG_CODE_TTL_VIOLATION = "TTL_VIOLATION";
|
||||||
|
|
||||||
|
// Default TTL values
|
||||||
|
private static final long DEFAULT_TTL_SECONDS = 3600; // 1 hour
|
||||||
|
private static final long MIN_TTL_SECONDS = 60; // 1 minute
|
||||||
|
private static final long MAX_TTL_SECONDS = 86400; // 24 hours
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final DailyNotificationDatabase database;
|
||||||
|
private final boolean useSharedStorage;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @param context Application context
|
||||||
|
* @param database SQLite database (null if using SharedPreferences)
|
||||||
|
* @param useSharedStorage Whether to use SQLite or SharedPreferences
|
||||||
|
*/
|
||||||
|
public DailyNotificationTTLEnforcer(Context context, DailyNotificationDatabase database, boolean useSharedStorage) {
|
||||||
|
this.context = context;
|
||||||
|
this.database = database;
|
||||||
|
this.useSharedStorage = useSharedStorage;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if notification content is fresh enough to arm
|
||||||
|
*
|
||||||
|
* @param slotId Notification slot ID
|
||||||
|
* @param scheduledTime T (slot time) - when notification should fire
|
||||||
|
* @param fetchedAt When content was fetched
|
||||||
|
* @return true if content is fresh enough to arm
|
||||||
|
*/
|
||||||
|
public boolean isContentFresh(String slotId, long scheduledTime, long fetchedAt) {
|
||||||
|
try {
|
||||||
|
long ttlSeconds = getTTLSeconds();
|
||||||
|
|
||||||
|
// Calculate age at fire time
|
||||||
|
long ageAtFireTime = scheduledTime - fetchedAt;
|
||||||
|
long ageAtFireSeconds = TimeUnit.MILLISECONDS.toSeconds(ageAtFireTime);
|
||||||
|
|
||||||
|
boolean isFresh = ageAtFireSeconds <= ttlSeconds;
|
||||||
|
|
||||||
|
if (!isFresh) {
|
||||||
|
logTTLViolation(slotId, scheduledTime, fetchedAt, ageAtFireSeconds, ttlSeconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("TTL check for %s: age=%ds, ttl=%ds, fresh=%s",
|
||||||
|
slotId, ageAtFireSeconds, ttlSeconds, isFresh));
|
||||||
|
|
||||||
|
return isFresh;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking content freshness", e);
|
||||||
|
// Default to allowing arming if check fails
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if notification content is fresh enough to arm (using stored fetchedAt)
|
||||||
|
*
|
||||||
|
* @param slotId Notification slot ID
|
||||||
|
* @param scheduledTime T (slot time) - when notification should fire
|
||||||
|
* @return true if content is fresh enough to arm
|
||||||
|
*/
|
||||||
|
public boolean isContentFresh(String slotId, long scheduledTime) {
|
||||||
|
try {
|
||||||
|
long fetchedAt = getFetchedAt(slotId);
|
||||||
|
if (fetchedAt == 0) {
|
||||||
|
Log.w(TAG, "No fetchedAt found for slot: " + slotId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isContentFresh(slotId, scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error checking content freshness for slot: " + slotId, e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validate freshness before arming notification
|
||||||
|
*
|
||||||
|
* @param notificationContent Notification content to validate
|
||||||
|
* @return true if notification should be armed
|
||||||
|
*/
|
||||||
|
public boolean validateBeforeArming(NotificationContent notificationContent) {
|
||||||
|
try {
|
||||||
|
String slotId = notificationContent.getId();
|
||||||
|
long scheduledTime = notificationContent.getScheduledTime();
|
||||||
|
long fetchedAt = notificationContent.getFetchedAt();
|
||||||
|
|
||||||
|
Log.d(TAG, String.format("Validating freshness before arming: slot=%s, scheduled=%d, fetched=%d",
|
||||||
|
slotId, scheduledTime, fetchedAt));
|
||||||
|
|
||||||
|
boolean isFresh = isContentFresh(slotId, scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
if (!isFresh) {
|
||||||
|
Log.w(TAG, "Skipping arming due to TTL violation: " + slotId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.d(TAG, "Content is fresh, proceeding with arming: " + slotId);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error validating freshness before arming", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TTL seconds from configuration
|
||||||
|
*
|
||||||
|
* @return TTL in seconds
|
||||||
|
*/
|
||||||
|
private long getTTLSeconds() {
|
||||||
|
try {
|
||||||
|
if (useSharedStorage && database != null) {
|
||||||
|
return getTTLFromSQLite();
|
||||||
|
} else {
|
||||||
|
return getTTLFromSharedPreferences();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting TTL seconds", e);
|
||||||
|
return DEFAULT_TTL_SECONDS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TTL from SQLite database
|
||||||
|
*
|
||||||
|
* @return TTL in seconds
|
||||||
|
*/
|
||||||
|
private long getTTLFromSQLite() {
|
||||||
|
try {
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
android.database.Cursor cursor = db.query(
|
||||||
|
DailyNotificationDatabase.TABLE_NOTIF_CONFIG,
|
||||||
|
new String[]{DailyNotificationDatabase.COL_CONFIG_V},
|
||||||
|
DailyNotificationDatabase.COL_CONFIG_K + " = ?",
|
||||||
|
new String[]{"ttlSeconds"},
|
||||||
|
null, null, null
|
||||||
|
);
|
||||||
|
|
||||||
|
long ttlSeconds = DEFAULT_TTL_SECONDS;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
ttlSeconds = Long.parseLong(cursor.getString(0));
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
// Validate TTL range
|
||||||
|
ttlSeconds = Math.max(MIN_TTL_SECONDS, Math.min(MAX_TTL_SECONDS, ttlSeconds));
|
||||||
|
|
||||||
|
return ttlSeconds;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting TTL from SQLite", e);
|
||||||
|
return DEFAULT_TTL_SECONDS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TTL from SharedPreferences
|
||||||
|
*
|
||||||
|
* @return TTL in seconds
|
||||||
|
*/
|
||||||
|
private long getTTLFromSharedPreferences() {
|
||||||
|
try {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences("DailyNotificationPrefs", Context.MODE_PRIVATE);
|
||||||
|
long ttlSeconds = prefs.getLong("ttlSeconds", DEFAULT_TTL_SECONDS);
|
||||||
|
|
||||||
|
// Validate TTL range
|
||||||
|
ttlSeconds = Math.max(MIN_TTL_SECONDS, Math.min(MAX_TTL_SECONDS, ttlSeconds));
|
||||||
|
|
||||||
|
return ttlSeconds;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting TTL from SharedPreferences", e);
|
||||||
|
return DEFAULT_TTL_SECONDS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fetchedAt timestamp for a slot
|
||||||
|
*
|
||||||
|
* @param slotId Notification slot ID
|
||||||
|
* @return FetchedAt timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
private long getFetchedAt(String slotId) {
|
||||||
|
try {
|
||||||
|
if (useSharedStorage && database != null) {
|
||||||
|
return getFetchedAtFromSQLite(slotId);
|
||||||
|
} else {
|
||||||
|
return getFetchedAtFromSharedPreferences(slotId);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting fetchedAt for slot: " + slotId, e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fetchedAt from SQLite database
|
||||||
|
*
|
||||||
|
* @param slotId Notification slot ID
|
||||||
|
* @return FetchedAt timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
private long getFetchedAtFromSQLite(String slotId) {
|
||||||
|
try {
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
android.database.Cursor cursor = db.query(
|
||||||
|
DailyNotificationDatabase.TABLE_NOTIF_CONTENTS,
|
||||||
|
new String[]{DailyNotificationDatabase.COL_CONTENTS_FETCHED_AT},
|
||||||
|
DailyNotificationDatabase.COL_CONTENTS_SLOT_ID + " = ?",
|
||||||
|
new String[]{slotId},
|
||||||
|
null, null,
|
||||||
|
DailyNotificationDatabase.COL_CONTENTS_FETCHED_AT + " DESC",
|
||||||
|
"1"
|
||||||
|
);
|
||||||
|
|
||||||
|
long fetchedAt = 0;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
fetchedAt = cursor.getLong(0);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
return fetchedAt;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting fetchedAt from SQLite", e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get fetchedAt from SharedPreferences
|
||||||
|
*
|
||||||
|
* @param slotId Notification slot ID
|
||||||
|
* @return FetchedAt timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
private long getFetchedAtFromSharedPreferences(String slotId) {
|
||||||
|
try {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences("DailyNotificationPrefs", Context.MODE_PRIVATE);
|
||||||
|
return prefs.getLong("last_fetch_" + slotId, 0);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting fetchedAt from SharedPreferences", e);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log TTL violation with detailed information
|
||||||
|
*
|
||||||
|
* @param slotId Notification slot ID
|
||||||
|
* @param scheduledTime When notification was scheduled to fire
|
||||||
|
* @param fetchedAt When content was fetched
|
||||||
|
* @param ageAtFireSeconds Age of content at fire time
|
||||||
|
* @param ttlSeconds TTL limit in seconds
|
||||||
|
*/
|
||||||
|
private void logTTLViolation(String slotId, long scheduledTime, long fetchedAt,
|
||||||
|
long ageAtFireSeconds, long ttlSeconds) {
|
||||||
|
try {
|
||||||
|
String violationMessage = String.format(
|
||||||
|
"TTL violation: slot=%s, scheduled=%d, fetched=%d, age=%ds, ttl=%ds",
|
||||||
|
slotId, scheduledTime, fetchedAt, ageAtFireSeconds, ttlSeconds
|
||||||
|
);
|
||||||
|
|
||||||
|
Log.w(TAG, LOG_CODE_TTL_VIOLATION + ": " + violationMessage);
|
||||||
|
|
||||||
|
// Store violation in database or SharedPreferences for analytics
|
||||||
|
storeTTLViolation(slotId, scheduledTime, fetchedAt, ageAtFireSeconds, ttlSeconds);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error logging TTL violation", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store TTL violation for analytics
|
||||||
|
*/
|
||||||
|
private void storeTTLViolation(String slotId, long scheduledTime, long fetchedAt,
|
||||||
|
long ageAtFireSeconds, long ttlSeconds) {
|
||||||
|
try {
|
||||||
|
if (useSharedStorage && database != null) {
|
||||||
|
storeTTLViolationInSQLite(slotId, scheduledTime, fetchedAt, ageAtFireSeconds, ttlSeconds);
|
||||||
|
} else {
|
||||||
|
storeTTLViolationInSharedPreferences(slotId, scheduledTime, fetchedAt, ageAtFireSeconds, ttlSeconds);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error storing TTL violation", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store TTL violation in SQLite database
|
||||||
|
*/
|
||||||
|
private void storeTTLViolationInSQLite(String slotId, long scheduledTime, long fetchedAt,
|
||||||
|
long ageAtFireSeconds, long ttlSeconds) {
|
||||||
|
try {
|
||||||
|
SQLiteDatabase db = database.getWritableDatabase();
|
||||||
|
|
||||||
|
// Insert into notif_deliveries with error status
|
||||||
|
android.content.ContentValues values = new android.content.ContentValues();
|
||||||
|
values.put(DailyNotificationDatabase.COL_DELIVERIES_SLOT_ID, slotId);
|
||||||
|
values.put(DailyNotificationDatabase.COL_DELIVERIES_FIRE_AT, scheduledTime);
|
||||||
|
values.put(DailyNotificationDatabase.COL_DELIVERIES_STATUS, DailyNotificationDatabase.STATUS_ERROR);
|
||||||
|
values.put(DailyNotificationDatabase.COL_DELIVERIES_ERROR_CODE, LOG_CODE_TTL_VIOLATION);
|
||||||
|
values.put(DailyNotificationDatabase.COL_DELIVERIES_ERROR_MESSAGE,
|
||||||
|
String.format("Content age %ds exceeds TTL %ds", ageAtFireSeconds, ttlSeconds));
|
||||||
|
|
||||||
|
db.insert(DailyNotificationDatabase.TABLE_NOTIF_DELIVERIES, null, values);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error storing TTL violation in SQLite", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store TTL violation in SharedPreferences
|
||||||
|
*/
|
||||||
|
private void storeTTLViolationInSharedPreferences(String slotId, long scheduledTime, long fetchedAt,
|
||||||
|
long ageAtFireSeconds, long ttlSeconds) {
|
||||||
|
try {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences("DailyNotificationPrefs", Context.MODE_PRIVATE);
|
||||||
|
SharedPreferences.Editor editor = prefs.edit();
|
||||||
|
|
||||||
|
String violationKey = "ttl_violation_" + slotId + "_" + scheduledTime;
|
||||||
|
String violationValue = String.format("%d,%d,%d,%d", fetchedAt, ageAtFireSeconds, ttlSeconds, System.currentTimeMillis());
|
||||||
|
|
||||||
|
editor.putString(violationKey, violationValue);
|
||||||
|
editor.apply();
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error storing TTL violation in SharedPreferences", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TTL violation statistics
|
||||||
|
*
|
||||||
|
* @return Statistics string
|
||||||
|
*/
|
||||||
|
public String getTTLViolationStats() {
|
||||||
|
try {
|
||||||
|
if (useSharedStorage && database != null) {
|
||||||
|
return getTTLViolationStatsFromSQLite();
|
||||||
|
} else {
|
||||||
|
return getTTLViolationStatsFromSharedPreferences();
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting TTL violation stats", e);
|
||||||
|
return "Error retrieving TTL violation statistics";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TTL violation statistics from SQLite
|
||||||
|
*/
|
||||||
|
private String getTTLViolationStatsFromSQLite() {
|
||||||
|
try {
|
||||||
|
SQLiteDatabase db = database.getReadableDatabase();
|
||||||
|
android.database.Cursor cursor = db.rawQuery(
|
||||||
|
"SELECT COUNT(*) FROM " + DailyNotificationDatabase.TABLE_NOTIF_DELIVERIES +
|
||||||
|
" WHERE " + DailyNotificationDatabase.COL_DELIVERIES_ERROR_CODE + " = ?",
|
||||||
|
new String[]{LOG_CODE_TTL_VIOLATION}
|
||||||
|
);
|
||||||
|
|
||||||
|
int violationCount = 0;
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
violationCount = cursor.getInt(0);
|
||||||
|
}
|
||||||
|
cursor.close();
|
||||||
|
|
||||||
|
return String.format("TTL violations: %d", violationCount);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting TTL violation stats from SQLite", e);
|
||||||
|
return "Error retrieving TTL violation statistics";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get TTL violation statistics from SharedPreferences
|
||||||
|
*/
|
||||||
|
private String getTTLViolationStatsFromSharedPreferences() {
|
||||||
|
try {
|
||||||
|
SharedPreferences prefs = context.getSharedPreferences("DailyNotificationPrefs", Context.MODE_PRIVATE);
|
||||||
|
java.util.Map<String, ?> allPrefs = prefs.getAll();
|
||||||
|
|
||||||
|
int violationCount = 0;
|
||||||
|
for (String key : allPrefs.keySet()) {
|
||||||
|
if (key.startsWith("ttl_violation_")) {
|
||||||
|
violationCount++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return String.format("TTL violations: %d", violationCount);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error getting TTL violation stats from SharedPreferences", e);
|
||||||
|
return "Error retrieving TTL violation statistics";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
217
src/android/DailyNotificationTTLEnforcerTest.java
Normal file
217
src/android/DailyNotificationTTLEnforcerTest.java
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
/**
|
||||||
|
* DailyNotificationTTLEnforcerTest.java
|
||||||
|
*
|
||||||
|
* Unit tests for TTL-at-fire enforcement functionality
|
||||||
|
* Tests freshness validation, TTL violation logging, and skip logic
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
import android.test.mock.MockContext;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unit tests for DailyNotificationTTLEnforcer
|
||||||
|
*
|
||||||
|
* Tests the core TTL enforcement functionality including:
|
||||||
|
* - Freshness validation before arming
|
||||||
|
* - TTL violation detection and logging
|
||||||
|
* - Skip logic for stale content
|
||||||
|
* - Configuration retrieval from storage
|
||||||
|
*/
|
||||||
|
public class DailyNotificationTTLEnforcerTest extends AndroidTestCase {
|
||||||
|
|
||||||
|
private DailyNotificationTTLEnforcer ttlEnforcer;
|
||||||
|
private Context mockContext;
|
||||||
|
private DailyNotificationDatabase database;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
|
||||||
|
// Create mock context
|
||||||
|
mockContext = new MockContext() {
|
||||||
|
@Override
|
||||||
|
public android.content.SharedPreferences getSharedPreferences(String name, int mode) {
|
||||||
|
return getContext().getSharedPreferences(name, mode);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create database instance
|
||||||
|
database = new DailyNotificationDatabase(mockContext);
|
||||||
|
|
||||||
|
// Create TTL enforcer with SQLite storage
|
||||||
|
ttlEnforcer = new DailyNotificationTTLEnforcer(mockContext, database, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
if (database != null) {
|
||||||
|
database.close();
|
||||||
|
}
|
||||||
|
super.tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test freshness validation with fresh content
|
||||||
|
*/
|
||||||
|
public void testFreshContentValidation() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30); // 30 minutes from now
|
||||||
|
long fetchedAt = currentTime - TimeUnit.MINUTES.toMillis(5); // 5 minutes ago
|
||||||
|
|
||||||
|
boolean isFresh = ttlEnforcer.isContentFresh("test_slot_1", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
assertTrue("Content should be fresh (5 min old, scheduled 30 min from now)", isFresh);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test freshness validation with stale content
|
||||||
|
*/
|
||||||
|
public void testStaleContentValidation() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30); // 30 minutes from now
|
||||||
|
long fetchedAt = currentTime - TimeUnit.HOURS.toMillis(2); // 2 hours ago
|
||||||
|
|
||||||
|
boolean isFresh = ttlEnforcer.isContentFresh("test_slot_2", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
assertFalse("Content should be stale (2 hours old, exceeds 1 hour TTL)", isFresh);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test TTL violation detection
|
||||||
|
*/
|
||||||
|
public void testTTLViolationDetection() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.HOURS.toMillis(2); // 2 hours ago
|
||||||
|
|
||||||
|
// This should trigger a TTL violation
|
||||||
|
boolean isFresh = ttlEnforcer.isContentFresh("test_slot_3", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
assertFalse("Should detect TTL violation", isFresh);
|
||||||
|
|
||||||
|
// Check that violation was logged (we can't easily test the actual logging,
|
||||||
|
// but we can verify the method returns false as expected)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test validateBeforeArming with fresh content
|
||||||
|
*/
|
||||||
|
public void testValidateBeforeArmingFresh() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.MINUTES.toMillis(5);
|
||||||
|
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.setId("test_slot_4");
|
||||||
|
content.setScheduledTime(scheduledTime);
|
||||||
|
content.setFetchedAt(fetchedAt);
|
||||||
|
content.setTitle("Test Notification");
|
||||||
|
content.setBody("Test body");
|
||||||
|
|
||||||
|
boolean shouldArm = ttlEnforcer.validateBeforeArming(content);
|
||||||
|
|
||||||
|
assertTrue("Should arm fresh content", shouldArm);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test validateBeforeArming with stale content
|
||||||
|
*/
|
||||||
|
public void testValidateBeforeArmingStale() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.HOURS.toMillis(2);
|
||||||
|
|
||||||
|
NotificationContent content = new NotificationContent();
|
||||||
|
content.setId("test_slot_5");
|
||||||
|
content.setScheduledTime(scheduledTime);
|
||||||
|
content.setFetchedAt(fetchedAt);
|
||||||
|
content.setTitle("Test Notification");
|
||||||
|
content.setBody("Test body");
|
||||||
|
|
||||||
|
boolean shouldArm = ttlEnforcer.validateBeforeArming(content);
|
||||||
|
|
||||||
|
assertFalse("Should not arm stale content", shouldArm);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test edge case: content fetched exactly at TTL limit
|
||||||
|
*/
|
||||||
|
public void testTTLBoundaryCase() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.HOURS.toMillis(1); // Exactly 1 hour ago (TTL limit)
|
||||||
|
|
||||||
|
boolean isFresh = ttlEnforcer.isContentFresh("test_slot_6", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
assertTrue("Content at TTL boundary should be considered fresh", isFresh);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test edge case: content fetched just over TTL limit
|
||||||
|
*/
|
||||||
|
public void testTTLBoundaryCaseOver() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.HOURS.toMillis(1) - TimeUnit.SECONDS.toMillis(1); // 1 hour + 1 second ago
|
||||||
|
|
||||||
|
boolean isFresh = ttlEnforcer.isContentFresh("test_slot_7", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
assertFalse("Content just over TTL limit should be considered stale", isFresh);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test TTL violation statistics
|
||||||
|
*/
|
||||||
|
public void testTTLViolationStats() {
|
||||||
|
// Generate some TTL violations
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.HOURS.toMillis(2);
|
||||||
|
|
||||||
|
// Trigger TTL violations
|
||||||
|
ttlEnforcer.isContentFresh("test_slot_8", scheduledTime, fetchedAt);
|
||||||
|
ttlEnforcer.isContentFresh("test_slot_9", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
String stats = ttlEnforcer.getTTLViolationStats();
|
||||||
|
|
||||||
|
assertNotNull("TTL violation stats should not be null", stats);
|
||||||
|
assertTrue("Stats should contain violation count", stats.contains("violations"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test error handling with invalid parameters
|
||||||
|
*/
|
||||||
|
public void testErrorHandling() {
|
||||||
|
// Test with null slot ID
|
||||||
|
boolean result = ttlEnforcer.isContentFresh(null, System.currentTimeMillis(), System.currentTimeMillis());
|
||||||
|
assertFalse("Should handle null slot ID gracefully", result);
|
||||||
|
|
||||||
|
// Test with invalid timestamps
|
||||||
|
result = ttlEnforcer.isContentFresh("test_slot_10", 0, 0);
|
||||||
|
assertTrue("Should handle invalid timestamps gracefully", result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test TTL configuration retrieval
|
||||||
|
*/
|
||||||
|
public void testTTLConfiguration() {
|
||||||
|
// Test that TTL enforcer can retrieve configuration
|
||||||
|
// This is indirectly tested through the freshness checks
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long scheduledTime = currentTime + TimeUnit.MINUTES.toMillis(30);
|
||||||
|
long fetchedAt = currentTime - TimeUnit.MINUTES.toMillis(30); // 30 minutes ago
|
||||||
|
|
||||||
|
boolean isFresh = ttlEnforcer.isContentFresh("test_slot_11", scheduledTime, fetchedAt);
|
||||||
|
|
||||||
|
// Should be fresh (30 min < 1 hour TTL)
|
||||||
|
assertTrue("Should retrieve TTL configuration correctly", isFresh);
|
||||||
|
}
|
||||||
|
}
|
||||||
580
src/android/EnhancedDailyNotificationFetcher.java
Normal file
580
src/android/EnhancedDailyNotificationFetcher.java
Normal file
@@ -0,0 +1,580 @@
|
|||||||
|
/**
|
||||||
|
* EnhancedDailyNotificationFetcher.java
|
||||||
|
*
|
||||||
|
* Enhanced Android content fetcher with TimeSafari Endorser.ch API support
|
||||||
|
* Extends existing DailyNotificationFetcher with JWT authentication and Endorser.ch endpoints
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
* @created 2025-10-03 06:53:30 UTC
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enhanced content fetcher with TimeSafari integration
|
||||||
|
*
|
||||||
|
* This class extends the existing DailyNotificationFetcher with:
|
||||||
|
* - JWT authentication via DailyNotificationJWTManager
|
||||||
|
* - Endorser.ch API endpoint support
|
||||||
|
* - ActiveDid-aware content fetching
|
||||||
|
* - Parallel API request handling for offers, projects, people, items
|
||||||
|
* - Integration with existing ETagManager infrastructure
|
||||||
|
*/
|
||||||
|
public class EnhancedDailyNotificationFetcher extends DailyNotificationFetcher {
|
||||||
|
|
||||||
|
// MARK: - Constants
|
||||||
|
|
||||||
|
private static final String TAG = "EnhancedDailyNotificationFetcher";
|
||||||
|
|
||||||
|
// Endorser.ch API Endpoints
|
||||||
|
private static final String ENDPOINT_OFFERS = "/api/v2/report/offers";
|
||||||
|
private static final String ENDPOINT_OFFERS_TO_PLANS = "/api/v2/report/offersToPlansOwnedByMe";
|
||||||
|
private static final String ENDPOINT_PLANS_UPDATED = "/api/v2/report/plansLastUpdatedBetween";
|
||||||
|
|
||||||
|
// API Configuration
|
||||||
|
private static final int API_TIMEOUT_MS = 30000; // 30 seconds
|
||||||
|
|
||||||
|
// MARK: - Properties
|
||||||
|
|
||||||
|
private final DailyNotificationJWTManager jwtManager;
|
||||||
|
private String apiServerUrl;
|
||||||
|
|
||||||
|
// MARK: - Initialization
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor with JWT Manager integration
|
||||||
|
*
|
||||||
|
* @param context Android context
|
||||||
|
* @param etagManager ETagManager instance (from parent)
|
||||||
|
* @param jwtManager JWT authentication manager
|
||||||
|
*/
|
||||||
|
public EnhancedDailyNotificationFetcher(
|
||||||
|
Context context,
|
||||||
|
DailyNotificationStorage storage,
|
||||||
|
DailyNotificationETagManager etagManager,
|
||||||
|
DailyNotificationJWTManager jwtManager
|
||||||
|
) {
|
||||||
|
super(context, storage);
|
||||||
|
|
||||||
|
this.jwtManager = jwtManager;
|
||||||
|
|
||||||
|
Log.d(TAG, "EnhancedDailyNotificationFetcher initialized with JWT support");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set API server URL for Endorser.ch endpoints
|
||||||
|
*
|
||||||
|
* @param apiServerUrl Base URL for TimeSafari API server
|
||||||
|
*/
|
||||||
|
public void setApiServerUrl(String apiServerUrl) {
|
||||||
|
this.apiServerUrl = apiServerUrl;
|
||||||
|
Log.d(TAG, "API Server URL set: " + apiServerUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Endorser.ch API Methods
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch offers to complete user with pagination
|
||||||
|
*
|
||||||
|
* This implements the GET /api/v2/report/offers endpoint
|
||||||
|
*
|
||||||
|
* @param recipientDid DID of user receiving offers
|
||||||
|
* @param afterId JWT ID of last known offer (for pagination)
|
||||||
|
* @param beforeId JWT ID of earliest known offer (optional)
|
||||||
|
* @return Future with OffersResponse result
|
||||||
|
*/
|
||||||
|
public CompletableFuture<OffersResponse> fetchEndorserOffers(String recipientDid, String afterId, String beforeId) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Fetching Endorser offers for recipient: " + recipientDid);
|
||||||
|
|
||||||
|
// Validate parameters
|
||||||
|
if (recipientDid == null || recipientDid.isEmpty()) {
|
||||||
|
throw new IllegalArgumentException("recipientDid cannot be null or empty");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (apiServerUrl == null || apiServerUrl.isEmpty()) {
|
||||||
|
throw new IllegalStateException("API server URL not set");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build URL with query parameters
|
||||||
|
String url = buildOffersUrl(recipientDid, afterId, beforeId);
|
||||||
|
|
||||||
|
// Make authenticated request
|
||||||
|
return makeAuthenticatedRequest(url, OffersResponse.class);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error fetching Endorser offers", e);
|
||||||
|
CompletableFuture<OffersResponse> errorFuture = new CompletableFuture<>();
|
||||||
|
errorFuture.completeExceptionally(e);
|
||||||
|
return errorFuture;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch offers to projects owned by user
|
||||||
|
*
|
||||||
|
* This implements the GET /api/v2/report/offersToPlansOwnedByMe endpoint
|
||||||
|
*
|
||||||
|
* @param afterId JWT ID of last known offer (for pagination)
|
||||||
|
* @return Future with OffersToPlansResponse result
|
||||||
|
*/
|
||||||
|
public CompletableFuture<OffersToPlansResponse> fetchOffersToMyPlans(String afterId) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Fetching offers to user's plans");
|
||||||
|
|
||||||
|
String url = buildOffersToPlansUrl(afterId);
|
||||||
|
|
||||||
|
// Make authenticated request
|
||||||
|
return makeAuthenticatedRequest(url, OffersToPlansResponse.class);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error fetching offers to plans", e);
|
||||||
|
CompletableFuture<OffersToPlansResponse> errorFuture = new CompletableFuture<>();
|
||||||
|
errorFuture.completeExceptionally(e);
|
||||||
|
return errorFuture;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch project updates for starred/interesting projects
|
||||||
|
*
|
||||||
|
* This implements the POST /api/v2/report/plansLastUpdatedBetween endpoint
|
||||||
|
*
|
||||||
|
* @param planIds Array of plan IDs to check for updates
|
||||||
|
* @param afterId JWT ID of last known project update
|
||||||
|
* @return Future with PlansLastUpdatedResponse result
|
||||||
|
*/
|
||||||
|
public CompletableFuture<PlansLastUpdatedResponse> fetchProjectsLastUpdated(List<String> planIds, String afterId) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Fetching project updates for " + planIds.size() + " plans");
|
||||||
|
|
||||||
|
String url = apiServerUrl + ENDPOINT_PLANS_UPDATED;
|
||||||
|
|
||||||
|
// Create POST request body
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("planIds", planIds);
|
||||||
|
if (afterId != null) {
|
||||||
|
requestBody.put("afterId", afterId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make authenticated POST request
|
||||||
|
return makeAuthenticatedPostRequest(url, requestBody, PlansLastUpdatedResponse.class);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error fetching project updates", e);
|
||||||
|
CompletableFuture<PlansLastUpdatedResponse> errorFuture = new CompletableFuture<>();
|
||||||
|
errorFuture.completeExceptionally(e);
|
||||||
|
return errorFuture;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch all TimeSafari notification data in parallel (main method)
|
||||||
|
*
|
||||||
|
* This combines offers and project updates into a comprehensive fetch operation
|
||||||
|
*
|
||||||
|
* @param userConfig TimeSafari user configuration
|
||||||
|
* @return Future with comprehensive notification data
|
||||||
|
*/
|
||||||
|
public CompletableFuture<TimeSafariNotificationBundle> fetchAllTimeSafariData(TimeSafariUserConfig userConfig) {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Starting comprehensive TimeSafari data fetch");
|
||||||
|
|
||||||
|
// Validate configuration
|
||||||
|
if (userConfig.activeDid == null) {
|
||||||
|
throw new IllegalArgumentException("activeDid is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set activeDid for authentication
|
||||||
|
jwtManager.setActiveDid(userConfig.activeDid);
|
||||||
|
|
||||||
|
// Create list of parallel requests
|
||||||
|
List<CompletableFuture<?>> futures = new ArrayList<>();
|
||||||
|
CompletableFuture<OffersResponse> offersToPerson = null;
|
||||||
|
CompletableFuture<OffersToPlansResponse> offersToProjects = null;
|
||||||
|
CompletableFuture<PlansLastUpdatedResponse> projectUpdates = null;
|
||||||
|
|
||||||
|
// Request 1: Offers to person
|
||||||
|
if (userConfig.fetchOffersToPerson) {
|
||||||
|
offersToPerson = fetchEndorserOffers(userConfig.activeDid, userConfig.lastKnownOfferId, null);
|
||||||
|
futures.add(offersToPerson);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request 2: Offers to user's projects
|
||||||
|
if (userConfig.fetchOffersToProjects) {
|
||||||
|
offersToProjects = fetchOffersToMyPlans(userConfig.lastKnownOfferId);
|
||||||
|
futures.add(offersToProjects);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request 3: Project updates
|
||||||
|
if (userConfig.fetchProjectUpdates && userConfig.starredPlanIds != null && !userConfig.starredPlanIds.isEmpty()) {
|
||||||
|
projectUpdates = fetchProjectsLastUpdated(userConfig.starredPlanIds, userConfig.lastKnownPlanId);
|
||||||
|
futures.add(projectUpdates);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for all requests to complete
|
||||||
|
CompletableFuture<Void> allFutures = CompletableFuture.allOf(
|
||||||
|
futures.toArray(new CompletableFuture[0])
|
||||||
|
);
|
||||||
|
|
||||||
|
// Combine results into bundle
|
||||||
|
return allFutures.thenApply(v -> {
|
||||||
|
try {
|
||||||
|
TimeSafariNotificationBundle bundle = new TimeSafariNotificationBundle();
|
||||||
|
|
||||||
|
if (offersToPerson != null) {
|
||||||
|
bundle.offersToPerson = offersToPerson.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (offersToProjects != null) {
|
||||||
|
bundle.offersToProjects = offersToProjects.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (projectUpdates != null) {
|
||||||
|
bundle.projectUpdates = projectUpdates.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
bundle.fetchTimestamp = System.currentTimeMillis();
|
||||||
|
bundle.success = true;
|
||||||
|
|
||||||
|
Log.i(TAG, "TimeSafari data fetch completed successfully");
|
||||||
|
return bundle;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error processing TimeSafari data", e);
|
||||||
|
TimeSafariNotificationBundle errorBundle = new TimeSafariNotificationBundle();
|
||||||
|
errorBundle.success = false;
|
||||||
|
errorBundle.error = e.getMessage();
|
||||||
|
return errorBundle;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error starting TimeSafari data fetch", e);
|
||||||
|
CompletableFuture<TimeSafariNotificationBundle> errorFuture = new CompletableFuture<>();
|
||||||
|
errorFuture.completeExceptionally(e);
|
||||||
|
return errorFuture;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - URL Building
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build offers URL with query parameters
|
||||||
|
*/
|
||||||
|
private String buildOffersUrl(String recipientDid, String afterId, String beforeId) {
|
||||||
|
StringBuilder url = new StringBuilder();
|
||||||
|
url.append(apiServerUrl).append(ENDPOINT_OFFERS);
|
||||||
|
url.append("?recipientDid=").append(recipientDid);
|
||||||
|
|
||||||
|
if (afterId != null) {
|
||||||
|
url.append("&afterId=").append(afterId);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (beforeId != null) {
|
||||||
|
url.append("&beforeId=").append(beforeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return url.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build offers to plans URL with query parameters
|
||||||
|
*/
|
||||||
|
private String buildOffersToPlansUrl(String afterId) {
|
||||||
|
StringBuilder url = new StringBuilder();
|
||||||
|
url.append(apiServerUrl).append(ENDPOINT_OFFERS_TO_PLANS);
|
||||||
|
|
||||||
|
if (afterId != null) {
|
||||||
|
url.append("?afterId=").append(afterId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return url.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Authenticated HTTP Requests
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make authenticated GET request
|
||||||
|
*
|
||||||
|
* @param url Request URL
|
||||||
|
* @param responseClass Expected response type
|
||||||
|
* @return Future with response
|
||||||
|
*/
|
||||||
|
private <T> CompletableFuture<T> makeAuthenticatedRequest(String url, Class<T> responseClass) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Making authenticated GET request to: " + url);
|
||||||
|
|
||||||
|
// Create HTTP connection
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
|
||||||
|
connection.setConnectTimeout(API_TIMEOUT_MS);
|
||||||
|
connection.setReadTimeout(API_TIMEOUT_MS);
|
||||||
|
connection.setRequestMethod("GET");
|
||||||
|
|
||||||
|
// Enhance with JWT authentication
|
||||||
|
jwtManager.enhanceHttpClientWithJWT(connection);
|
||||||
|
|
||||||
|
// Execute request
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
if (responseCode == 200) {
|
||||||
|
String responseBody = readResponseBody(connection);
|
||||||
|
return parseResponse(responseBody, responseClass);
|
||||||
|
} else {
|
||||||
|
throw new IOException("HTTP error: " + responseCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error in authenticated request", e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make authenticated POST request
|
||||||
|
*
|
||||||
|
* @param url Request URL
|
||||||
|
* @param requestBody POST body data
|
||||||
|
* @param responseChallass Expected response type
|
||||||
|
* @return Future with response
|
||||||
|
*/
|
||||||
|
private <T> CompletableFuture<T> makeAuthenticatedPostRequest(String url, Map<String, Object> requestBody, Class<T> responseChallass) {
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
try {
|
||||||
|
Log.d(TAG, "Making authenticated POST request to: " + url);
|
||||||
|
|
||||||
|
// Create HTTP connection
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
|
||||||
|
connection.setConnectTimeout(API_TIMEOUT_MS);
|
||||||
|
connection.setReadTimeout(API_TIMEOUT_MS);
|
||||||
|
connection.setRequestMethod("POST");
|
||||||
|
connection.setDoOutput(true);
|
||||||
|
|
||||||
|
// Enhance with JWT authentication
|
||||||
|
connection.setRequestProperty("Content-Type", "application/json");
|
||||||
|
jwtManager.enhanceHttpClientWithJWT(connection);
|
||||||
|
|
||||||
|
// Write POST body
|
||||||
|
String jsonBody = mapToJson(requestBody);
|
||||||
|
connection.getOutputStream().write(jsonBody.getBytes(StandardCharsets.UTF_8));
|
||||||
|
|
||||||
|
// Execute request
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
if (responseCode == 200) {
|
||||||
|
String responseBody = readResponseBody(connection);
|
||||||
|
return parseResponse(responseBody, responseChallass);
|
||||||
|
} else {
|
||||||
|
throw new IOException("HTTP error: " + responseCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error in authenticated POST request", e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Response Processing
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read response body from connection
|
||||||
|
*/
|
||||||
|
private String readResponseBody(HttpURLConnection connection) throws IOException {
|
||||||
|
// This is a simplified implementation
|
||||||
|
// In production, you'd want proper stream handling
|
||||||
|
return "Mock response body"; // Placeholder
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse JSON response into object
|
||||||
|
*/
|
||||||
|
private <T> T parseResponse(String jsonResponse, Class<T> responseChallass) {
|
||||||
|
// Phase 1: Simplified parsing
|
||||||
|
// Production would use proper JSON parsing (Gson, Jackson, etc.)
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (responseChallass == OffersResponse.class) {
|
||||||
|
return (T) createMockOffersResponse();
|
||||||
|
} else if (responseChallass == OffersToPlansResponse.class) {
|
||||||
|
return (T) createMockOffersToPlansResponse();
|
||||||
|
} else if (responseChallass == PlansLastUpdatedResponse.class) {
|
||||||
|
return (T) createMockPlansResponse();
|
||||||
|
} else {
|
||||||
|
throw new IllegalArgumentException("Unsupported response type: " + responseChallass.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Error parsing response", e);
|
||||||
|
throw new RuntimeException("Failed to parse response", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert map to JSON (simplified)
|
||||||
|
*/
|
||||||
|
private String mapToJson(Map<String, Object> map) {
|
||||||
|
StringBuilder json = new StringBuilder("{");
|
||||||
|
boolean first = true;
|
||||||
|
|
||||||
|
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||||
|
if (!first) json.append(",");
|
||||||
|
json.append("\"").append(entry.getKey()).append("\":");
|
||||||
|
|
||||||
|
Object value = entry.getValue();
|
||||||
|
if (value instanceof String) {
|
||||||
|
json.append("\"").append(value).append("\"");
|
||||||
|
} else if (value instanceof List) {
|
||||||
|
json.append(listToJson((List<?>) value));
|
||||||
|
} else {
|
||||||
|
json.append(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
first = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
json.append("}");
|
||||||
|
return json.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert list to JSON (simplified)
|
||||||
|
*/
|
||||||
|
private String listToJson(List<?> list) {
|
||||||
|
StringBuilder json = new StringBuilder("[");
|
||||||
|
boolean first = true;
|
||||||
|
|
||||||
|
for (Object item : list) {
|
||||||
|
if (!first) json.append(",");
|
||||||
|
|
||||||
|
if (item instanceof String) {
|
||||||
|
json.append("\"").append(item).append("\"");
|
||||||
|
} else {
|
||||||
|
json.append(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
first = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
json.append("]");
|
||||||
|
return json.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Mock Responses (Phase 1 Testing)
|
||||||
|
|
||||||
|
private OffersResponse createMockOffersResponse() {
|
||||||
|
OffersResponse response = new OffersResponse();
|
||||||
|
response.data = new ArrayList<>();
|
||||||
|
response.hitLimit = false;
|
||||||
|
|
||||||
|
// Add mock offer
|
||||||
|
OfferSummaryRecord offer = new OfferSummaryRecord();
|
||||||
|
offer.jwtId = "mock-offer-1";
|
||||||
|
offer.handleId = "offer-123";
|
||||||
|
offer.offeredByDid = "did:example:offerer";
|
||||||
|
offer.recipientDid = "did:example:recipient";
|
||||||
|
offer.amount = 1000;
|
||||||
|
offer.unit = "USD";
|
||||||
|
offer.objectDescription = "Mock offer for testing";
|
||||||
|
|
||||||
|
response.data.add(offer);
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
private OffersToPlansResponse createMockOffersToPlansResponse() {
|
||||||
|
OffersToPlansResponse response = new OffersToPlansResponse();
|
||||||
|
response.data = new ArrayList<>();
|
||||||
|
response.hitLimit = false;
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
private PlansLastUpdatedResponse createMockPlansResponse() {
|
||||||
|
PlansLastUpdatedResponse response = new PlansLastUpdatedResponse();
|
||||||
|
response.data = new ArrayList<>();
|
||||||
|
response.hitLimit = false;
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Data Classes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TimeSafari user configuration for API requests
|
||||||
|
*/
|
||||||
|
public static class TimeSafariUserConfig {
|
||||||
|
public String activeDid;
|
||||||
|
public String lastKnownOfferId;
|
||||||
|
public String lastKnownPlanId;
|
||||||
|
public List<String> starredPlanIds;
|
||||||
|
public boolean fetchOffersToPerson = true;
|
||||||
|
public boolean fetchOffersToProjects = true;
|
||||||
|
public boolean fetchProjectUpdates = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Comprehensive notification data bundle
|
||||||
|
*/
|
||||||
|
public static class TimeSafariNotificationBundle {
|
||||||
|
public OffersResponse offersToPerson;
|
||||||
|
public OffersToPlansResponse offersToProjects;
|
||||||
|
public PlansLastUpdatedResponse projectUpdates;
|
||||||
|
public long fetchTimestamp;
|
||||||
|
public boolean success;
|
||||||
|
public String error;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offer summary record
|
||||||
|
*/
|
||||||
|
public static class OfferSummaryRecord {
|
||||||
|
public String jwtId;
|
||||||
|
public String handleId;
|
||||||
|
public String offeredByDid;
|
||||||
|
public String recipientDid;
|
||||||
|
public int amount;
|
||||||
|
public String unit;
|
||||||
|
public String objectDescription;
|
||||||
|
// Additional fields as needed
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offers response
|
||||||
|
*/
|
||||||
|
public static class OffersResponse {
|
||||||
|
public List<OfferSummaryRecord> data;
|
||||||
|
public boolean hitLimit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offers to plans response
|
||||||
|
*/
|
||||||
|
public static class OffersToPlansResponse {
|
||||||
|
public List<Object> data; // Simplified for Phase 1
|
||||||
|
public boolean hitLimit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plans last updated response
|
||||||
|
*/
|
||||||
|
public static class PlansLastUpdatedResponse {
|
||||||
|
public List<Object> data; // Simplified for Phase 1
|
||||||
|
public boolean hitLimit;
|
||||||
|
}
|
||||||
|
}
|
||||||
315
src/android/NotificationContent.java
Normal file
315
src/android/NotificationContent.java
Normal file
@@ -0,0 +1,315 @@
|
|||||||
|
/**
|
||||||
|
* NotificationContent.java
|
||||||
|
*
|
||||||
|
* Data model for notification content following the project directive schema
|
||||||
|
* Implements the canonical NotificationContent v1 structure
|
||||||
|
*
|
||||||
|
* @author Matthew Raymer
|
||||||
|
* @version 1.0.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.timesafari.dailynotification;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents notification content with all required fields
|
||||||
|
*
|
||||||
|
* This class follows the canonical schema defined in the project directive:
|
||||||
|
* - id: string (uuid)
|
||||||
|
* - title: string
|
||||||
|
* - body: string (plain text; may include simple emoji)
|
||||||
|
* - scheduledTime: epoch millis (client-local target)
|
||||||
|
* - mediaUrl: string? (for future; must be mirrored to local path before use)
|
||||||
|
* - fetchTime: epoch millis
|
||||||
|
*/
|
||||||
|
public class NotificationContent {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private String title;
|
||||||
|
private String body;
|
||||||
|
private long scheduledTime;
|
||||||
|
private String mediaUrl;
|
||||||
|
private long fetchTime;
|
||||||
|
private boolean sound;
|
||||||
|
private String priority;
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default constructor with auto-generated UUID
|
||||||
|
*/
|
||||||
|
public NotificationContent() {
|
||||||
|
this.id = UUID.randomUUID().toString();
|
||||||
|
this.fetchTime = System.currentTimeMillis();
|
||||||
|
this.sound = true;
|
||||||
|
this.priority = "default";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor with all required fields
|
||||||
|
*
|
||||||
|
* @param title Notification title
|
||||||
|
* @param body Notification body text
|
||||||
|
* @param scheduledTime When to display the notification
|
||||||
|
*/
|
||||||
|
public NotificationContent(String title, String body, long scheduledTime) {
|
||||||
|
this();
|
||||||
|
this.title = title;
|
||||||
|
this.body = body;
|
||||||
|
this.scheduledTime = scheduledTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Getters and Setters
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the unique identifier for this notification
|
||||||
|
*
|
||||||
|
* @return UUID string
|
||||||
|
*/
|
||||||
|
public String getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the unique identifier for this notification
|
||||||
|
*
|
||||||
|
* @param id UUID string
|
||||||
|
*/
|
||||||
|
public void setId(String id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification title
|
||||||
|
*
|
||||||
|
* @return Title string
|
||||||
|
*/
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the notification title
|
||||||
|
*
|
||||||
|
* @param title Title string
|
||||||
|
*/
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification body text
|
||||||
|
*
|
||||||
|
* @return Body text string
|
||||||
|
*/
|
||||||
|
public String getBody() {
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the notification body text
|
||||||
|
*
|
||||||
|
* @param body Body text string
|
||||||
|
*/
|
||||||
|
public void setBody(String body) {
|
||||||
|
this.body = body;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the scheduled time for this notification
|
||||||
|
*
|
||||||
|
* @return Timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
public long getScheduledTime() {
|
||||||
|
return scheduledTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the scheduled time for this notification
|
||||||
|
*
|
||||||
|
* @param scheduledTime Timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
public void setScheduledTime(long scheduledTime) {
|
||||||
|
this.scheduledTime = scheduledTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the media URL (optional, for future use)
|
||||||
|
*
|
||||||
|
* @return Media URL string or null
|
||||||
|
*/
|
||||||
|
public String getMediaUrl() {
|
||||||
|
return mediaUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the media URL (optional, for future use)
|
||||||
|
*
|
||||||
|
* @param mediaUrl Media URL string or null
|
||||||
|
*/
|
||||||
|
public void setMediaUrl(String mediaUrl) {
|
||||||
|
this.mediaUrl = mediaUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the fetch time when content was retrieved
|
||||||
|
*
|
||||||
|
* @return Timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
public long getFetchTime() {
|
||||||
|
return fetchTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the fetch time when content was retrieved
|
||||||
|
*
|
||||||
|
* @param fetchTime Timestamp in milliseconds
|
||||||
|
*/
|
||||||
|
public void setFetchTime(long fetchTime) {
|
||||||
|
this.fetchTime = fetchTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if sound should be played
|
||||||
|
*
|
||||||
|
* @return true if sound is enabled
|
||||||
|
*/
|
||||||
|
public boolean isSound() {
|
||||||
|
return sound;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set whether sound should be played
|
||||||
|
*
|
||||||
|
* @param sound true to enable sound
|
||||||
|
*/
|
||||||
|
public void setSound(boolean sound) {
|
||||||
|
this.sound = sound;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification priority
|
||||||
|
*
|
||||||
|
* @return Priority string (high, default, low)
|
||||||
|
*/
|
||||||
|
public String getPriority() {
|
||||||
|
return priority;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the notification priority
|
||||||
|
*
|
||||||
|
* @param priority Priority string (high, default, low)
|
||||||
|
*/
|
||||||
|
public void setPriority(String priority) {
|
||||||
|
this.priority = priority;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the associated URL
|
||||||
|
*
|
||||||
|
* @return URL string or null
|
||||||
|
*/
|
||||||
|
public String getUrl() {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the associated URL
|
||||||
|
*
|
||||||
|
* @param url URL string or null
|
||||||
|
*/
|
||||||
|
public void setUrl(String url) {
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if this notification is stale (older than 24 hours)
|
||||||
|
*
|
||||||
|
* @return true if notification is stale
|
||||||
|
*/
|
||||||
|
public boolean isStale() {
|
||||||
|
long currentTime = System.currentTimeMillis();
|
||||||
|
long age = currentTime - fetchTime;
|
||||||
|
return age > 24 * 60 * 60 * 1000; // 24 hours in milliseconds
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the age of this notification in milliseconds
|
||||||
|
*
|
||||||
|
* @return Age in milliseconds
|
||||||
|
*/
|
||||||
|
public long getAge() {
|
||||||
|
return System.currentTimeMillis() - fetchTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the age of this notification in a human-readable format
|
||||||
|
*
|
||||||
|
* @return Human-readable age string
|
||||||
|
*/
|
||||||
|
public String getAgeString() {
|
||||||
|
long age = getAge();
|
||||||
|
long seconds = age / 1000;
|
||||||
|
long minutes = seconds / 60;
|
||||||
|
long hours = minutes / 60;
|
||||||
|
long days = hours / 24;
|
||||||
|
|
||||||
|
if (days > 0) {
|
||||||
|
return days + " day" + (days == 1 ? "" : "s") + " ago";
|
||||||
|
} else if (hours > 0) {
|
||||||
|
return hours + " hour" + (hours == 1 ? "" : "s") + " ago";
|
||||||
|
} else if (minutes > 0) {
|
||||||
|
return minutes + " minute" + (minutes == 1 ? "" : "s") + " ago";
|
||||||
|
} else {
|
||||||
|
return "just now";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if this notification is ready to be displayed
|
||||||
|
*
|
||||||
|
* @return true if notification should be displayed now
|
||||||
|
*/
|
||||||
|
public boolean isReadyToDisplay() {
|
||||||
|
return System.currentTimeMillis() >= scheduledTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get time until this notification should be displayed
|
||||||
|
*
|
||||||
|
* @return Time in milliseconds until display
|
||||||
|
*/
|
||||||
|
public long getTimeUntilDisplay() {
|
||||||
|
return Math.max(0, scheduledTime - System.currentTimeMillis());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "NotificationContent{" +
|
||||||
|
"id='" + id + '\'' +
|
||||||
|
", title='" + title + '\'' +
|
||||||
|
", body='" + body + '\'' +
|
||||||
|
", scheduledTime=" + scheduledTime +
|
||||||
|
", mediaUrl='" + mediaUrl + '\'' +
|
||||||
|
", fetchTime=" + fetchTime +
|
||||||
|
", sound=" + sound +
|
||||||
|
", priority='" + priority + '\'' +
|
||||||
|
", url='" + url + '\'' +
|
||||||
|
'}';
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
|
||||||
|
NotificationContent that = (NotificationContent) o;
|
||||||
|
return id.equals(that.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return id.hashCode();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
/**
|
|
||||||
* Core Contracts
|
|
||||||
*
|
|
||||||
* Shared interfaces and record shapes for cross-platform contracts.
|
|
||||||
* These represent wire-level contracts that cross JS ↔ native boundaries
|
|
||||||
* and are persisted long-term.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type {
|
|
||||||
ScheduleKind,
|
|
||||||
HistoryKind,
|
|
||||||
HistoryOutcome,
|
|
||||||
CallbackKind,
|
|
||||||
ConfigDataType,
|
|
||||||
} from './enums';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recurring schedule pattern stored in database
|
|
||||||
* Used to restore schedules after device reboot
|
|
||||||
*/
|
|
||||||
export interface Schedule {
|
|
||||||
/** Unique schedule identifier */
|
|
||||||
id: string;
|
|
||||||
/** Schedule type: 'fetch' for content fetching, 'notify' for notifications */
|
|
||||||
kind: ScheduleKind;
|
|
||||||
/** Cron expression (e.g., "0 9 * * *" for daily at 9 AM) */
|
|
||||||
cron?: string;
|
|
||||||
/** Clock time in HH:mm format (e.g., "09:00") */
|
|
||||||
clockTime?: string;
|
|
||||||
/** Whether schedule is enabled */
|
|
||||||
enabled: boolean;
|
|
||||||
/** Timestamp of last execution (milliseconds since epoch) */
|
|
||||||
lastRunAt?: number;
|
|
||||||
/** Timestamp of next scheduled execution (milliseconds since epoch) */
|
|
||||||
nextRunAt?: number;
|
|
||||||
/** Random jitter in milliseconds for timing variation */
|
|
||||||
jitterMs: number;
|
|
||||||
/** Backoff policy ('exp' for exponential, etc.) */
|
|
||||||
backoffPolicy: string;
|
|
||||||
/** Optional JSON state for advanced scheduling */
|
|
||||||
stateJson?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule with AlarmManager status
|
|
||||||
* Extends Schedule with isActuallyScheduled flag indicating if alarm is registered in AlarmManager
|
|
||||||
*/
|
|
||||||
export interface ScheduleWithStatus extends Schedule {
|
|
||||||
/** Whether the alarm is actually scheduled in AlarmManager (Android only, for 'notify' schedules) */
|
|
||||||
isActuallyScheduled: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Input type for creating a new schedule
|
|
||||||
*/
|
|
||||||
export interface CreateScheduleInput {
|
|
||||||
kind: ScheduleKind;
|
|
||||||
cron?: string;
|
|
||||||
clockTime?: string;
|
|
||||||
enabled?: boolean;
|
|
||||||
jitterMs?: number;
|
|
||||||
backoffPolicy?: string;
|
|
||||||
stateJson?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Content cache entry with TTL
|
|
||||||
* Stores prefetched content for offline-first display
|
|
||||||
*/
|
|
||||||
export interface ContentCache {
|
|
||||||
/** Unique cache identifier */
|
|
||||||
id: string;
|
|
||||||
/** Timestamp when content was fetched (milliseconds since epoch) */
|
|
||||||
fetchedAt: number;
|
|
||||||
/** Time-to-live in seconds */
|
|
||||||
ttlSeconds: number;
|
|
||||||
/** Content payload (JSON string or base64 encoded) */
|
|
||||||
payload: string;
|
|
||||||
/** Optional metadata */
|
|
||||||
meta?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Input type for creating a content cache entry
|
|
||||||
*/
|
|
||||||
export interface CreateContentCacheInput {
|
|
||||||
id?: string; // Auto-generated if not provided
|
|
||||||
payload: string;
|
|
||||||
ttlSeconds: number;
|
|
||||||
meta?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Plugin configuration entry
|
|
||||||
* Stores user preferences and plugin settings
|
|
||||||
*/
|
|
||||||
export interface Config {
|
|
||||||
/** Unique configuration identifier */
|
|
||||||
id: string;
|
|
||||||
/** Optional TimeSafari DID for user-specific configs */
|
|
||||||
timesafariDid?: string;
|
|
||||||
/** Configuration type (e.g., 'plugin_setting', 'user_preference') */
|
|
||||||
configType: string;
|
|
||||||
/** Configuration key */
|
|
||||||
configKey: string;
|
|
||||||
/** Configuration value (stored as string, parsed based on configDataType) */
|
|
||||||
configValue: string;
|
|
||||||
/** Data type: 'string' | 'boolean' | 'integer' | 'long' | 'float' | 'double' | 'json' */
|
|
||||||
configDataType: ConfigDataType;
|
|
||||||
/** Whether value is encrypted */
|
|
||||||
isEncrypted: boolean;
|
|
||||||
/** Timestamp when config was created (milliseconds since epoch) */
|
|
||||||
createdAt: number;
|
|
||||||
/** Timestamp when config was last updated (milliseconds since epoch) */
|
|
||||||
updatedAt: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Input type for creating a configuration entry
|
|
||||||
*/
|
|
||||||
export interface CreateConfigInput {
|
|
||||||
id?: string; // Auto-generated if not provided
|
|
||||||
timesafariDid?: string;
|
|
||||||
configType: string;
|
|
||||||
configKey: string;
|
|
||||||
configValue: string;
|
|
||||||
configDataType?: ConfigDataType; // Defaults to 'string' if not provided
|
|
||||||
isEncrypted?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Callback configuration
|
|
||||||
* Stores callback endpoint configurations for execution after events
|
|
||||||
*/
|
|
||||||
export interface Callback {
|
|
||||||
/** Unique callback identifier */
|
|
||||||
id: string;
|
|
||||||
/** Callback type: 'http' for HTTP requests, 'local' for local handlers, 'queue' for queue */
|
|
||||||
kind: CallbackKind;
|
|
||||||
/** Target URL or identifier */
|
|
||||||
target: string;
|
|
||||||
/** Optional JSON headers for HTTP callbacks */
|
|
||||||
headersJson?: string;
|
|
||||||
/** Whether callback is enabled */
|
|
||||||
enabled: boolean;
|
|
||||||
/** Timestamp when callback was created (milliseconds since epoch) */
|
|
||||||
createdAt: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Input type for creating a callback configuration
|
|
||||||
*/
|
|
||||||
export interface CreateCallbackInput {
|
|
||||||
id: string;
|
|
||||||
kind: CallbackKind;
|
|
||||||
target: string;
|
|
||||||
headersJson?: string;
|
|
||||||
enabled?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execution history entry
|
|
||||||
* Logs fetch/notify/callback execution for debugging and analytics
|
|
||||||
*/
|
|
||||||
export interface History {
|
|
||||||
/** Auto-incrementing history ID */
|
|
||||||
id: number;
|
|
||||||
/** Reference ID (content ID, schedule ID, etc.) */
|
|
||||||
refId: string;
|
|
||||||
/** Execution kind: 'fetch' | 'notify' | 'callback' | 'boot_recovery' */
|
|
||||||
kind: HistoryKind;
|
|
||||||
/** Timestamp when execution occurred (milliseconds since epoch) */
|
|
||||||
occurredAt: number;
|
|
||||||
/** Execution duration in milliseconds */
|
|
||||||
durationMs?: number;
|
|
||||||
/** Outcome: 'success' | 'failure' | 'skipped_ttl' | 'circuit_open' */
|
|
||||||
outcome: HistoryOutcome;
|
|
||||||
/** Optional JSON diagnostics */
|
|
||||||
diagJson?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* History statistics
|
|
||||||
*/
|
|
||||||
export interface HistoryStats {
|
|
||||||
/** Total number of history entries */
|
|
||||||
totalCount: number;
|
|
||||||
/** Count by outcome */
|
|
||||||
outcomes: Record<string, number>;
|
|
||||||
/** Count by kind */
|
|
||||||
kinds: Record<string, number>;
|
|
||||||
/** Most recent execution timestamp */
|
|
||||||
mostRecent?: number;
|
|
||||||
/** Oldest execution timestamp */
|
|
||||||
oldest?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,110 +0,0 @@
|
|||||||
/**
|
|
||||||
* Core Enums
|
|
||||||
*
|
|
||||||
* Shared enums for notification lifecycle, delivery outcomes,
|
|
||||||
* recovery reasons, and other cross-platform constants.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Permission state enum
|
|
||||||
*
|
|
||||||
* Represents the state of notification permissions across platforms
|
|
||||||
*/
|
|
||||||
export enum PermissionState {
|
|
||||||
PROMPT = 'prompt',
|
|
||||||
PROMPT_WITH_RATIONALE = 'prompt-with-rationale',
|
|
||||||
GRANTED = 'granted',
|
|
||||||
DENIED = 'denied',
|
|
||||||
PROVISIONAL = 'provisional',
|
|
||||||
EPHEMERAL = 'ephemeral',
|
|
||||||
UNKNOWN = 'unknown',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Notification priority levels
|
|
||||||
*
|
|
||||||
* Standard priority values for notifications
|
|
||||||
*/
|
|
||||||
export enum NotificationPriority {
|
|
||||||
MIN = 'min',
|
|
||||||
LOW = 'low',
|
|
||||||
DEFAULT = 'default',
|
|
||||||
NORMAL = 'normal',
|
|
||||||
HIGH = 'high',
|
|
||||||
MAX = 'max',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule kind
|
|
||||||
*
|
|
||||||
* Type of schedule (fetch for content fetching, notify for notifications)
|
|
||||||
*/
|
|
||||||
export enum ScheduleKind {
|
|
||||||
FETCH = 'fetch',
|
|
||||||
NOTIFY = 'notify',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* History execution kind
|
|
||||||
*
|
|
||||||
* Type of execution recorded in history
|
|
||||||
*/
|
|
||||||
export enum HistoryKind {
|
|
||||||
FETCH = 'fetch',
|
|
||||||
NOTIFY = 'notify',
|
|
||||||
CALLBACK = 'callback',
|
|
||||||
BOOT_RECOVERY = 'boot_recovery',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* History outcome
|
|
||||||
*
|
|
||||||
* Result of an execution recorded in history
|
|
||||||
*/
|
|
||||||
export enum HistoryOutcome {
|
|
||||||
SUCCESS = 'success',
|
|
||||||
FAILURE = 'failure',
|
|
||||||
SKIPPED_TTL = 'skipped_ttl',
|
|
||||||
CIRCUIT_OPEN = 'circuit_open',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Callback kind
|
|
||||||
*
|
|
||||||
* Type of callback configuration
|
|
||||||
*/
|
|
||||||
export enum CallbackKind {
|
|
||||||
HTTP = 'http',
|
|
||||||
LOCAL = 'local',
|
|
||||||
QUEUE = 'queue',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Config data type
|
|
||||||
*
|
|
||||||
* Data type for configuration values
|
|
||||||
*/
|
|
||||||
export enum ConfigDataType {
|
|
||||||
STRING = 'string',
|
|
||||||
BOOLEAN = 'boolean',
|
|
||||||
INTEGER = 'integer',
|
|
||||||
LONG = 'long',
|
|
||||||
FLOAT = 'float',
|
|
||||||
DOUBLE = 'double',
|
|
||||||
JSON = 'json',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cache eviction policy
|
|
||||||
*
|
|
||||||
* Policy for cache entry eviction
|
|
||||||
*/
|
|
||||||
export enum CacheEvictionPolicy {
|
|
||||||
LRU = 'LRU',
|
|
||||||
FIFO = 'FIFO',
|
|
||||||
TTL = 'TTL',
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,161 +0,0 @@
|
|||||||
/**
|
|
||||||
* Core Error Codes and Error Types
|
|
||||||
*
|
|
||||||
* Canonical error codes shared across all platforms (Android, iOS, Web).
|
|
||||||
* These codes must match native implementations exactly.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error code enum - stable identifiers for all error conditions
|
|
||||||
*
|
|
||||||
* These codes are append-only. Never repurpose existing values.
|
|
||||||
* New codes must be added at the end of their category.
|
|
||||||
*/
|
|
||||||
export enum ErrorCode {
|
|
||||||
// Permission Errors
|
|
||||||
NOTIFICATIONS_DENIED = 'notifications_denied',
|
|
||||||
BACKGROUND_REFRESH_DISABLED = 'background_refresh_disabled',
|
|
||||||
PERMISSION_DENIED = 'permission_denied',
|
|
||||||
NOTIFICATION_PERMISSION_DENIED = 'notification_permission_denied',
|
|
||||||
|
|
||||||
// Configuration Errors
|
|
||||||
INVALID_TIME_FORMAT = 'invalid_time_format',
|
|
||||||
INVALID_TIME_VALUES = 'invalid_time_values',
|
|
||||||
CONFIGURATION_FAILED = 'configuration_failed',
|
|
||||||
MISSING_REQUIRED_PARAMETER = 'missing_required_parameter',
|
|
||||||
|
|
||||||
// Scheduling Errors
|
|
||||||
SCHEDULING_FAILED = 'scheduling_failed',
|
|
||||||
TASK_SCHEDULING_FAILED = 'task_scheduling_failed',
|
|
||||||
NOTIFICATION_SCHEDULING_FAILED = 'notification_scheduling_failed',
|
|
||||||
PENDING_NOTIFICATION_LIMIT_EXCEEDED = 'pending_notification_limit_exceeded',
|
|
||||||
|
|
||||||
// Storage Errors
|
|
||||||
STORAGE_ERROR = 'storage_error',
|
|
||||||
DATABASE_ERROR = 'database_error',
|
|
||||||
|
|
||||||
// Network Errors
|
|
||||||
NETWORK_ERROR = 'network_error',
|
|
||||||
FETCH_FAILED = 'fetch_failed',
|
|
||||||
TIMEOUT = 'timeout',
|
|
||||||
|
|
||||||
// Background Task Errors (iOS-specific but cross-platform compatible)
|
|
||||||
BG_TASK_NOT_REGISTERED = 'bg_task_not_registered',
|
|
||||||
BG_TASK_EXECUTION_FAILED = 'bg_task_execution_failed',
|
|
||||||
|
|
||||||
// System Errors
|
|
||||||
PLUGIN_NOT_INITIALIZED = 'plugin_not_initialized',
|
|
||||||
INTERNAL_ERROR = 'internal_error',
|
|
||||||
SYSTEM_ERROR = 'system_error',
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error response shape for cross-platform error handling
|
|
||||||
*
|
|
||||||
* Matches the format expected by Capacitor bridge:
|
|
||||||
* {
|
|
||||||
* "error": "error_code",
|
|
||||||
* "message": "Human-readable error message"
|
|
||||||
* }
|
|
||||||
*/
|
|
||||||
export interface ErrorResponse {
|
|
||||||
/** Error code (from ErrorCode enum) */
|
|
||||||
error: string;
|
|
||||||
/** Human-readable error message */
|
|
||||||
message: string;
|
|
||||||
/** Optional additional context */
|
|
||||||
details?: Record<string, unknown>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Daily Notification Error class
|
|
||||||
*
|
|
||||||
* Structured error for plugin operations with error code and message
|
|
||||||
*/
|
|
||||||
export class DailyNotificationError extends Error {
|
|
||||||
public readonly code: ErrorCode;
|
|
||||||
public readonly details?: Record<string, unknown>;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
code: ErrorCode,
|
|
||||||
message: string,
|
|
||||||
details?: Record<string, unknown>
|
|
||||||
) {
|
|
||||||
super(message);
|
|
||||||
this.name = 'DailyNotificationError';
|
|
||||||
this.code = code;
|
|
||||||
this.details = details;
|
|
||||||
|
|
||||||
// Maintains proper stack trace for where error was thrown
|
|
||||||
if (Error.captureStackTrace) {
|
|
||||||
Error.captureStackTrace(this, DailyNotificationError);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert to ErrorResponse format for bridge serialization
|
|
||||||
*/
|
|
||||||
toResponse(): ErrorResponse {
|
|
||||||
return {
|
|
||||||
error: this.code,
|
|
||||||
message: this.message,
|
|
||||||
...(this.details && { details: this.details }),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create error for missing required parameter
|
|
||||||
*/
|
|
||||||
static missingParameter(parameter: string): DailyNotificationError {
|
|
||||||
return new DailyNotificationError(
|
|
||||||
ErrorCode.MISSING_REQUIRED_PARAMETER,
|
|
||||||
`Missing required parameter: ${parameter}`,
|
|
||||||
{ parameter }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create error for invalid time format
|
|
||||||
*/
|
|
||||||
static invalidTimeFormat(): DailyNotificationError {
|
|
||||||
return new DailyNotificationError(
|
|
||||||
ErrorCode.INVALID_TIME_FORMAT,
|
|
||||||
'Invalid time format. Use HH:mm'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create error for invalid time values
|
|
||||||
*/
|
|
||||||
static invalidTimeValues(): DailyNotificationError {
|
|
||||||
return new DailyNotificationError(
|
|
||||||
ErrorCode.INVALID_TIME_VALUES,
|
|
||||||
'Invalid time values'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create error for notifications denied
|
|
||||||
*/
|
|
||||||
static notificationsDenied(): DailyNotificationError {
|
|
||||||
return new DailyNotificationError(
|
|
||||||
ErrorCode.NOTIFICATIONS_DENIED,
|
|
||||||
'Notification permissions denied'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create error for configuration failure
|
|
||||||
*/
|
|
||||||
static configurationFailed(reason?: string): DailyNotificationError {
|
|
||||||
return new DailyNotificationError(
|
|
||||||
ErrorCode.CONFIGURATION_FAILED,
|
|
||||||
reason ? `Configuration failed: ${reason}` : 'Configuration failed',
|
|
||||||
reason ? { reason } : undefined
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
/**
|
|
||||||
* Core Events
|
|
||||||
*
|
|
||||||
* Event names, event payloads, and event logging interfaces.
|
|
||||||
* All event payloads include schemaVersion for future-proofing.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Event log entry
|
|
||||||
*
|
|
||||||
* Structured log entry for observability and debugging
|
|
||||||
*/
|
|
||||||
export interface EventLog {
|
|
||||||
/** Unique event identifier */
|
|
||||||
id: string;
|
|
||||||
/** Timestamp when event occurred (milliseconds since epoch) */
|
|
||||||
timestamp: number;
|
|
||||||
/** Log level */
|
|
||||||
level: 'INFO' | 'WARN' | 'ERROR';
|
|
||||||
/** Event code (e.g., 'DNP-FETCH-START') */
|
|
||||||
eventCode: string;
|
|
||||||
/** Human-readable message */
|
|
||||||
message: string;
|
|
||||||
/** Optional event data */
|
|
||||||
data?: Record<string, unknown>;
|
|
||||||
/** Optional duration in milliseconds */
|
|
||||||
duration?: number;
|
|
||||||
/** Schema version for future-proofing */
|
|
||||||
schemaVersion: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Event code constants
|
|
||||||
*
|
|
||||||
* Stable event codes for observability and logging
|
|
||||||
*/
|
|
||||||
export const EVENT_CODES = {
|
|
||||||
FETCH_START: 'DNP-FETCH-START',
|
|
||||||
FETCH_SUCCESS: 'DNP-FETCH-SUCCESS',
|
|
||||||
FETCH_FAILURE: 'DNP-FETCH-FAILURE',
|
|
||||||
FETCH_RETRY: 'DNP-FETCH-RETRY',
|
|
||||||
NOTIFY_START: 'DNP-NOTIFY-START',
|
|
||||||
NOTIFY_SUCCESS: 'DNP-NOTIFY-SUCCESS',
|
|
||||||
NOTIFY_FAILURE: 'DNP-NOTIFY-FAILURE',
|
|
||||||
NOTIFY_SKIPPED_TTL: 'DNP-NOTIFY-SKIPPED-TTL',
|
|
||||||
CALLBACK_START: 'DNP-CB-START',
|
|
||||||
CALLBACK_SUCCESS: 'DNP-CB-SUCCESS',
|
|
||||||
CALLBACK_FAILURE: 'DNP-CB-FAILURE',
|
|
||||||
CALLBACK_RETRY: 'DNP-CB-RETRY',
|
|
||||||
CALLBACK_CIRCUIT_OPEN: 'DNP-CB-CIRCUIT-OPEN',
|
|
||||||
CALLBACK_CIRCUIT_CLOSE: 'DNP-CB-CIRCUIT-CLOSE',
|
|
||||||
BOOT_RECOVERY: 'DNP-BOOT-RECOVERY',
|
|
||||||
SCHEDULE_UPDATE: 'DNP-SCHEDULE-UPDATE',
|
|
||||||
CACHE_HIT: 'DNP-CACHE-HIT',
|
|
||||||
CACHE_MISS: 'DNP-CACHE-MISS',
|
|
||||||
TTL_EXPIRED: 'DNP-TTL-EXPIRED',
|
|
||||||
METRICS_RESET: 'DNP-METRICS-RESET',
|
|
||||||
LOGS_COMPACTED: 'DNP-LOGS-COMPACTED',
|
|
||||||
// User interaction events
|
|
||||||
USER_OPT_OUT: 'DNP-USER-OPT-OUT',
|
|
||||||
USER_OPT_IN: 'DNP-USER-OPT-IN',
|
|
||||||
PERMISSION_DENIED: 'DNP-PERMISSION-DENIED',
|
|
||||||
PERMISSION_GRANTED: 'DNP-PERMISSION-GRANTED',
|
|
||||||
// Rate limiting events
|
|
||||||
RATE_LIMIT_HIT: 'DNP-RATE-LIMIT-HIT',
|
|
||||||
RATE_LIMIT_RESET: 'DNP-RATE-LIMIT-RESET',
|
|
||||||
BACKOFF_START: 'DNP-BACKOFF-START',
|
|
||||||
BACKOFF_END: 'DNP-BACKOFF-END',
|
|
||||||
// Storage events
|
|
||||||
STORAGE_FULL: 'DNP-STORAGE-FULL',
|
|
||||||
STORAGE_CLEANUP: 'DNP-STORAGE-CLEANUP',
|
|
||||||
// Platform-specific events
|
|
||||||
ANDROID_WORKMANAGER_START: 'DNP-ANDROID-WM-START',
|
|
||||||
IOS_BGTASK_START: 'DNP-IOS-BGTASK-START',
|
|
||||||
ELECTRON_NOTIFICATION: 'DNP-ELECTRON-NOTIFICATION',
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Current schema version for event payloads
|
|
||||||
*/
|
|
||||||
export const EVENT_SCHEMA_VERSION = 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create an event log entry with schema version
|
|
||||||
*/
|
|
||||||
export function createEventLog(
|
|
||||||
level: 'INFO' | 'WARN' | 'ERROR',
|
|
||||||
eventCode: string,
|
|
||||||
message: string,
|
|
||||||
data?: Record<string, unknown>,
|
|
||||||
duration?: number,
|
|
||||||
id?: string
|
|
||||||
): EventLog {
|
|
||||||
return {
|
|
||||||
id: id || `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
|
|
||||||
timestamp: Date.now(),
|
|
||||||
level,
|
|
||||||
eventCode,
|
|
||||||
message,
|
|
||||||
data,
|
|
||||||
duration,
|
|
||||||
schemaVersion: EVENT_SCHEMA_VERSION,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
/**
|
|
||||||
* Core Guards
|
|
||||||
*
|
|
||||||
* Lightweight runtime validators for core types.
|
|
||||||
* These are JSON-compatible and serialization-safe.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type { ScheduleKind, HistoryKind, HistoryOutcome, CallbackKind } from './enums';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Type guard: Check if value is a valid ScheduleKind
|
|
||||||
*/
|
|
||||||
export function isScheduleKind(value: unknown): value is ScheduleKind {
|
|
||||||
return value === 'fetch' || value === 'notify';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Type guard: Check if value is a valid HistoryKind
|
|
||||||
*/
|
|
||||||
export function isHistoryKind(value: unknown): value is HistoryKind {
|
|
||||||
return (
|
|
||||||
value === 'fetch' ||
|
|
||||||
value === 'notify' ||
|
|
||||||
value === 'callback' ||
|
|
||||||
value === 'boot_recovery'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Type guard: Check if value is a valid HistoryOutcome
|
|
||||||
*/
|
|
||||||
export function isHistoryOutcome(value: unknown): value is HistoryOutcome {
|
|
||||||
return (
|
|
||||||
value === 'success' ||
|
|
||||||
value === 'failure' ||
|
|
||||||
value === 'skipped_ttl' ||
|
|
||||||
value === 'circuit_open'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Type guard: Check if value is a valid CallbackKind
|
|
||||||
*/
|
|
||||||
export function isCallbackKind(value: unknown): value is CallbackKind {
|
|
||||||
return value === 'http' || value === 'local' || value === 'queue';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Validate time format (HH:mm)
|
|
||||||
*/
|
|
||||||
export function isValidTimeFormat(time: string): boolean {
|
|
||||||
const timeRegex = /^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/;
|
|
||||||
if (!timeRegex.test(time)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
const [hours, minutes] = time.split(':').map(Number);
|
|
||||||
return hours >= 0 && hours <= 23 && minutes >= 0 && minutes <= 59;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Validate timestamp (milliseconds since epoch)
|
|
||||||
*/
|
|
||||||
export function isValidTimestamp(timestamp: unknown): timestamp is number {
|
|
||||||
return (
|
|
||||||
typeof timestamp === 'number' &&
|
|
||||||
!isNaN(timestamp) &&
|
|
||||||
timestamp > 0 &&
|
|
||||||
timestamp < Number.MAX_SAFE_INTEGER
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
/**
|
|
||||||
* Core Types Module
|
|
||||||
*
|
|
||||||
* Canonical types surface for cross-platform contracts.
|
|
||||||
* This module provides stable, versioned types that guarantee
|
|
||||||
* Android, iOS, and Web agree on semantics.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Error codes and error types
|
|
||||||
export {
|
|
||||||
ErrorCode,
|
|
||||||
type ErrorResponse,
|
|
||||||
DailyNotificationError,
|
|
||||||
} from './errors';
|
|
||||||
|
|
||||||
// Enums
|
|
||||||
export {
|
|
||||||
PermissionState,
|
|
||||||
NotificationPriority,
|
|
||||||
ScheduleKind,
|
|
||||||
HistoryKind,
|
|
||||||
HistoryOutcome,
|
|
||||||
CallbackKind,
|
|
||||||
ConfigDataType,
|
|
||||||
CacheEvictionPolicy,
|
|
||||||
} from './enums';
|
|
||||||
|
|
||||||
// Core contracts (interfaces)
|
|
||||||
export type {
|
|
||||||
Schedule,
|
|
||||||
ScheduleWithStatus,
|
|
||||||
CreateScheduleInput,
|
|
||||||
ContentCache,
|
|
||||||
CreateContentCacheInput,
|
|
||||||
Config,
|
|
||||||
CreateConfigInput,
|
|
||||||
Callback,
|
|
||||||
CreateCallbackInput,
|
|
||||||
History,
|
|
||||||
HistoryStats,
|
|
||||||
} from './contracts';
|
|
||||||
|
|
||||||
// Events
|
|
||||||
export {
|
|
||||||
EVENT_CODES,
|
|
||||||
EVENT_SCHEMA_VERSION,
|
|
||||||
createEventLog,
|
|
||||||
type EventLog,
|
|
||||||
} from './events';
|
|
||||||
|
|
||||||
// Guards (runtime validators)
|
|
||||||
export {
|
|
||||||
isScheduleKind,
|
|
||||||
isHistoryKind,
|
|
||||||
isHistoryOutcome,
|
|
||||||
isCallbackKind,
|
|
||||||
isValidTimeFormat,
|
|
||||||
isValidTimestamp,
|
|
||||||
} from './guards';
|
|
||||||
|
|
||||||
@@ -14,54 +14,6 @@ import type {
|
|||||||
JsNotificationContentFetcher
|
JsNotificationContentFetcher
|
||||||
} from './types/content-fetcher';
|
} from './types/content-fetcher';
|
||||||
|
|
||||||
// Import core types for use in this file
|
|
||||||
import type {
|
|
||||||
Schedule,
|
|
||||||
ScheduleWithStatus,
|
|
||||||
CreateScheduleInput,
|
|
||||||
ContentCache,
|
|
||||||
CreateContentCacheInput,
|
|
||||||
Config,
|
|
||||||
CreateConfigInput,
|
|
||||||
Callback,
|
|
||||||
CreateCallbackInput,
|
|
||||||
History,
|
|
||||||
HistoryStats,
|
|
||||||
} from './core/contracts';
|
|
||||||
|
|
||||||
import {
|
|
||||||
PermissionState,
|
|
||||||
ScheduleKind,
|
|
||||||
HistoryKind,
|
|
||||||
HistoryOutcome,
|
|
||||||
CallbackKind,
|
|
||||||
ConfigDataType,
|
|
||||||
} from './core/enums';
|
|
||||||
|
|
||||||
// Re-export core types (canonical source) for external consumers
|
|
||||||
export type {
|
|
||||||
Schedule,
|
|
||||||
ScheduleWithStatus,
|
|
||||||
CreateScheduleInput,
|
|
||||||
ContentCache,
|
|
||||||
CreateContentCacheInput,
|
|
||||||
Config,
|
|
||||||
CreateConfigInput,
|
|
||||||
Callback,
|
|
||||||
CreateCallbackInput,
|
|
||||||
History,
|
|
||||||
HistoryStats,
|
|
||||||
};
|
|
||||||
|
|
||||||
export {
|
|
||||||
PermissionState,
|
|
||||||
ScheduleKind,
|
|
||||||
HistoryKind,
|
|
||||||
HistoryOutcome,
|
|
||||||
CallbackKind,
|
|
||||||
ConfigDataType,
|
|
||||||
};
|
|
||||||
|
|
||||||
export interface NotificationResponse {
|
export interface NotificationResponse {
|
||||||
id: string;
|
id: string;
|
||||||
title: string;
|
title: string;
|
||||||
@@ -178,7 +130,7 @@ export interface DailyReminderInfo {
|
|||||||
lastTriggered?: number;
|
lastTriggered?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
// PermissionState now exported from ./core/enums
|
export type PermissionState = 'prompt' | 'prompt-with-rationale' | 'granted' | 'denied' | 'provisional' | 'ephemeral' | 'unknown';
|
||||||
|
|
||||||
// Additional interfaces for enhanced functionality
|
// Additional interfaces for enhanced functionality
|
||||||
export interface NotificationMetrics {
|
export interface NotificationMetrics {
|
||||||
@@ -349,7 +301,186 @@ export interface ContentFetchResult {
|
|||||||
// See: docs/DATABASE_INTERFACES.md for complete documentation
|
// See: docs/DATABASE_INTERFACES.md for complete documentation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
// Core contracts (Schedule, ContentCache, Config, Callback, History) now exported from ./core/contracts
|
/**
|
||||||
|
* Recurring schedule pattern stored in database
|
||||||
|
* Used to restore schedules after device reboot
|
||||||
|
*/
|
||||||
|
export interface Schedule {
|
||||||
|
/** Unique schedule identifier */
|
||||||
|
id: string;
|
||||||
|
/** Schedule type: 'fetch' for content fetching, 'notify' for notifications */
|
||||||
|
kind: 'fetch' | 'notify';
|
||||||
|
/** Cron expression (e.g., "0 9 * * *" for daily at 9 AM) */
|
||||||
|
cron?: string;
|
||||||
|
/** Clock time in HH:mm format (e.g., "09:00") */
|
||||||
|
clockTime?: string;
|
||||||
|
/** Whether schedule is enabled */
|
||||||
|
enabled: boolean;
|
||||||
|
/** Timestamp of last execution (milliseconds since epoch) */
|
||||||
|
lastRunAt?: number;
|
||||||
|
/** Timestamp of next scheduled execution (milliseconds since epoch) */
|
||||||
|
nextRunAt?: number;
|
||||||
|
/** Random jitter in milliseconds for timing variation */
|
||||||
|
jitterMs: number;
|
||||||
|
/** Backoff policy ('exp' for exponential, etc.) */
|
||||||
|
backoffPolicy: string;
|
||||||
|
/** Optional JSON state for advanced scheduling */
|
||||||
|
stateJson?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Schedule with AlarmManager status
|
||||||
|
* Extends Schedule with isActuallyScheduled flag indicating if alarm is registered in AlarmManager
|
||||||
|
*/
|
||||||
|
export interface ScheduleWithStatus extends Schedule {
|
||||||
|
/** Whether the alarm is actually scheduled in AlarmManager (Android only, for 'notify' schedules) */
|
||||||
|
isActuallyScheduled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input type for creating a new schedule
|
||||||
|
*/
|
||||||
|
export interface CreateScheduleInput {
|
||||||
|
kind: 'fetch' | 'notify';
|
||||||
|
cron?: string;
|
||||||
|
clockTime?: string;
|
||||||
|
enabled?: boolean;
|
||||||
|
jitterMs?: number;
|
||||||
|
backoffPolicy?: string;
|
||||||
|
stateJson?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Content cache entry with TTL
|
||||||
|
* Stores prefetched content for offline-first display
|
||||||
|
*/
|
||||||
|
export interface ContentCache {
|
||||||
|
/** Unique cache identifier */
|
||||||
|
id: string;
|
||||||
|
/** Timestamp when content was fetched (milliseconds since epoch) */
|
||||||
|
fetchedAt: number;
|
||||||
|
/** Time-to-live in seconds */
|
||||||
|
ttlSeconds: number;
|
||||||
|
/** Content payload (JSON string or base64 encoded) */
|
||||||
|
payload: string;
|
||||||
|
/** Optional metadata */
|
||||||
|
meta?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input type for creating a content cache entry
|
||||||
|
*/
|
||||||
|
export interface CreateContentCacheInput {
|
||||||
|
id?: string; // Auto-generated if not provided
|
||||||
|
payload: string;
|
||||||
|
ttlSeconds: number;
|
||||||
|
meta?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plugin configuration entry
|
||||||
|
* Stores user preferences and plugin settings
|
||||||
|
*/
|
||||||
|
export interface Config {
|
||||||
|
/** Unique configuration identifier */
|
||||||
|
id: string;
|
||||||
|
/** Optional TimeSafari DID for user-specific configs */
|
||||||
|
timesafariDid?: string;
|
||||||
|
/** Configuration type (e.g., 'plugin_setting', 'user_preference') */
|
||||||
|
configType: string;
|
||||||
|
/** Configuration key */
|
||||||
|
configKey: string;
|
||||||
|
/** Configuration value (stored as string, parsed based on configDataType) */
|
||||||
|
configValue: string;
|
||||||
|
/** Data type: 'string' | 'boolean' | 'integer' | 'long' | 'float' | 'double' | 'json' */
|
||||||
|
configDataType: string;
|
||||||
|
/** Whether value is encrypted */
|
||||||
|
isEncrypted: boolean;
|
||||||
|
/** Timestamp when config was created (milliseconds since epoch) */
|
||||||
|
createdAt: number;
|
||||||
|
/** Timestamp when config was last updated (milliseconds since epoch) */
|
||||||
|
updatedAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input type for creating a configuration entry
|
||||||
|
*/
|
||||||
|
export interface CreateConfigInput {
|
||||||
|
id?: string; // Auto-generated if not provided
|
||||||
|
timesafariDid?: string;
|
||||||
|
configType: string;
|
||||||
|
configKey: string;
|
||||||
|
configValue: string;
|
||||||
|
configDataType?: string; // Defaults to 'string' if not provided
|
||||||
|
isEncrypted?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callback configuration
|
||||||
|
* Stores callback endpoint configurations for execution after events
|
||||||
|
*/
|
||||||
|
export interface Callback {
|
||||||
|
/** Unique callback identifier */
|
||||||
|
id: string;
|
||||||
|
/** Callback type: 'http' for HTTP requests, 'local' for local handlers, 'queue' for queue */
|
||||||
|
kind: 'http' | 'local' | 'queue';
|
||||||
|
/** Target URL or identifier */
|
||||||
|
target: string;
|
||||||
|
/** Optional JSON headers for HTTP callbacks */
|
||||||
|
headersJson?: string;
|
||||||
|
/** Whether callback is enabled */
|
||||||
|
enabled: boolean;
|
||||||
|
/** Timestamp when callback was created (milliseconds since epoch) */
|
||||||
|
createdAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input type for creating a callback configuration
|
||||||
|
*/
|
||||||
|
export interface CreateCallbackInput {
|
||||||
|
id: string;
|
||||||
|
kind: 'http' | 'local' | 'queue';
|
||||||
|
target: string;
|
||||||
|
headersJson?: string;
|
||||||
|
enabled?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execution history entry
|
||||||
|
* Logs fetch/notify/callback execution for debugging and analytics
|
||||||
|
*/
|
||||||
|
export interface History {
|
||||||
|
/** Auto-incrementing history ID */
|
||||||
|
id: number;
|
||||||
|
/** Reference ID (content ID, schedule ID, etc.) */
|
||||||
|
refId: string;
|
||||||
|
/** Execution kind: 'fetch' | 'notify' | 'callback' | 'boot_recovery' */
|
||||||
|
kind: 'fetch' | 'notify' | 'callback' | 'boot_recovery';
|
||||||
|
/** Timestamp when execution occurred (milliseconds since epoch) */
|
||||||
|
occurredAt: number;
|
||||||
|
/** Execution duration in milliseconds */
|
||||||
|
durationMs?: number;
|
||||||
|
/** Outcome: 'success' | 'failure' | 'skipped_ttl' | 'circuit_open' */
|
||||||
|
outcome: string;
|
||||||
|
/** Optional JSON diagnostics */
|
||||||
|
diagJson?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* History statistics
|
||||||
|
*/
|
||||||
|
export interface HistoryStats {
|
||||||
|
/** Total number of history entries */
|
||||||
|
totalCount: number;
|
||||||
|
/** Count by outcome */
|
||||||
|
outcomes: Record<string, number>;
|
||||||
|
/** Count by kind */
|
||||||
|
kinds: Record<string, number>;
|
||||||
|
/** Most recent execution timestamp */
|
||||||
|
mostRecent?: number;
|
||||||
|
/** Oldest execution timestamp */
|
||||||
|
oldest?: number;
|
||||||
|
}
|
||||||
|
|
||||||
export interface DualScheduleStatus {
|
export interface DualScheduleStatus {
|
||||||
contentFetch: {
|
contentFetch: {
|
||||||
|
|||||||
@@ -23,6 +23,4 @@ export * from './ios/timesafari-ios-config';
|
|||||||
export * from './services/DailyNotificationService';
|
export * from './services/DailyNotificationService';
|
||||||
export * from './services/DatabaseIntegrationService';
|
export * from './services/DatabaseIntegrationService';
|
||||||
export * from './utils/PlatformServiceMixin';
|
export * from './utils/PlatformServiceMixin';
|
||||||
// Core types are available via './core' export path
|
|
||||||
// (Not re-exported here to avoid conflicts with existing definitions)
|
|
||||||
export { DailyNotification };
|
export { DailyNotification };
|
||||||
|
|||||||
@@ -6,12 +6,6 @@
|
|||||||
* @version 1.1.0
|
* @version 1.1.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {
|
|
||||||
type EventLog,
|
|
||||||
EVENT_CODES,
|
|
||||||
createEventLog,
|
|
||||||
} from './core/events';
|
|
||||||
|
|
||||||
export interface HealthStatus {
|
export interface HealthStatus {
|
||||||
nextRuns: number[];
|
nextRuns: number[];
|
||||||
lastOutcomes: string[];
|
lastOutcomes: string[];
|
||||||
@@ -30,9 +24,15 @@ export interface HealthStatus {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-export EventLog and EVENT_CODES for backward compatibility
|
export interface EventLog {
|
||||||
export type { EventLog } from './core/events';
|
id: string;
|
||||||
export { EVENT_CODES } from './core/events';
|
timestamp: number;
|
||||||
|
level: 'INFO' | 'WARN' | 'ERROR';
|
||||||
|
eventCode: string;
|
||||||
|
message: string;
|
||||||
|
data?: Record<string, unknown>;
|
||||||
|
duration?: number;
|
||||||
|
}
|
||||||
|
|
||||||
export interface PerformanceMetrics {
|
export interface PerformanceMetrics {
|
||||||
fetchTimes: number[];
|
fetchTimes: number[];
|
||||||
@@ -100,14 +100,15 @@ export class ObservabilityManager {
|
|||||||
data?: Record<string, unknown>,
|
data?: Record<string, unknown>,
|
||||||
duration?: number
|
duration?: number
|
||||||
): void {
|
): void {
|
||||||
const event = createEventLog(
|
const event: EventLog = {
|
||||||
|
id: this.generateEventId(),
|
||||||
|
timestamp: Date.now(),
|
||||||
level,
|
level,
|
||||||
eventCode,
|
eventCode,
|
||||||
message,
|
message,
|
||||||
data,
|
data,
|
||||||
duration,
|
duration
|
||||||
this.generateEventId()
|
};
|
||||||
);
|
|
||||||
|
|
||||||
this.eventLogs.unshift(event);
|
this.eventLogs.unshift(event);
|
||||||
|
|
||||||
@@ -377,3 +378,45 @@ export class ObservabilityManager {
|
|||||||
|
|
||||||
// Singleton instance
|
// Singleton instance
|
||||||
export const observability = new ObservabilityManager();
|
export const observability = new ObservabilityManager();
|
||||||
|
|
||||||
|
// Event code constants
|
||||||
|
export const EVENT_CODES = {
|
||||||
|
FETCH_START: 'DNP-FETCH-START',
|
||||||
|
FETCH_SUCCESS: 'DNP-FETCH-SUCCESS',
|
||||||
|
FETCH_FAILURE: 'DNP-FETCH-FAILURE',
|
||||||
|
FETCH_RETRY: 'DNP-FETCH-RETRY',
|
||||||
|
NOTIFY_START: 'DNP-NOTIFY-START',
|
||||||
|
NOTIFY_SUCCESS: 'DNP-NOTIFY-SUCCESS',
|
||||||
|
NOTIFY_FAILURE: 'DNP-NOTIFY-FAILURE',
|
||||||
|
NOTIFY_SKIPPED_TTL: 'DNP-NOTIFY-SKIPPED-TTL',
|
||||||
|
CALLBACK_START: 'DNP-CB-START',
|
||||||
|
CALLBACK_SUCCESS: 'DNP-CB-SUCCESS',
|
||||||
|
CALLBACK_FAILURE: 'DNP-CB-FAILURE',
|
||||||
|
CALLBACK_RETRY: 'DNP-CB-RETRY',
|
||||||
|
CALLBACK_CIRCUIT_OPEN: 'DNP-CB-CIRCUIT-OPEN',
|
||||||
|
CALLBACK_CIRCUIT_CLOSE: 'DNP-CB-CIRCUIT-CLOSE',
|
||||||
|
BOOT_RECOVERY: 'DNP-BOOT-RECOVERY',
|
||||||
|
SCHEDULE_UPDATE: 'DNP-SCHEDULE-UPDATE',
|
||||||
|
CACHE_HIT: 'DNP-CACHE-HIT',
|
||||||
|
CACHE_MISS: 'DNP-CACHE-MISS',
|
||||||
|
TTL_EXPIRED: 'DNP-TTL-EXPIRED',
|
||||||
|
METRICS_RESET: 'DNP-METRICS-RESET',
|
||||||
|
LOGS_COMPACTED: 'DNP-LOGS-COMPACTED',
|
||||||
|
// User interaction events
|
||||||
|
USER_OPT_OUT: 'DNP-USER-OPT-OUT',
|
||||||
|
USER_OPT_IN: 'DNP-USER-OPT-IN',
|
||||||
|
PERMISSION_DENIED: 'DNP-PERMISSION-DENIED',
|
||||||
|
PERMISSION_GRANTED: 'DNP-PERMISSION-GRANTED',
|
||||||
|
// Rate limiting events
|
||||||
|
RATE_LIMIT_HIT: 'DNP-RATE-LIMIT-HIT',
|
||||||
|
RATE_LIMIT_RESET: 'DNP-RATE-LIMIT-RESET',
|
||||||
|
BACKOFF_START: 'DNP-BACKOFF-START',
|
||||||
|
BACKOFF_END: 'DNP-BACKOFF-END',
|
||||||
|
// Storage events
|
||||||
|
STORAGE_FULL: 'DNP-STORAGE-FULL',
|
||||||
|
STORAGE_CLEANUP: 'DNP-STORAGE-CLEANUP',
|
||||||
|
// Platform-specific events
|
||||||
|
ANDROID_WORKMANAGER_START: 'DNP-ANDROID-WM-START',
|
||||||
|
IOS_BGTASK_START: 'DNP-IOS-BGTASK-START',
|
||||||
|
ELECTRON_NOTIFICATION: 'DNP-ELECTRON-NOTIFICATION'
|
||||||
|
} as const;
|
||||||
|
|||||||
@@ -250,9 +250,7 @@ export function WithTimeSafariDailyNotifications<T extends Constructor>(Base: T)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor type for components
|
* Constructor type for components
|
||||||
* Note: any[] is required for TypeScript mixin pattern compatibility.
|
* Note: any[] is required for TypeScript mixin pattern compatibility
|
||||||
* TypeScript's mixin pattern requires any[] for constructor arguments.
|
|
||||||
* This is a TypeScript limitation, not a design choice.
|
|
||||||
*/
|
*/
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
type Constructor<T = Record<string, unknown>> = new (...args: any[]) => T;
|
type Constructor<T = Record<string, unknown>> = new (...args: any[]) => T;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { Plugin, UserConfig } from 'vite';
|
import type { Plugin } from 'vite';
|
||||||
|
|
||||||
export interface TimeSafariPluginOptions {
|
export interface TimeSafariPluginOptions {
|
||||||
/**
|
/**
|
||||||
@@ -55,7 +55,8 @@ export function timeSafariPlugin(options: TimeSafariPluginOptions = {}): Plugin
|
|||||||
name: 'timesafari-daily-notification',
|
name: 'timesafari-daily-notification',
|
||||||
|
|
||||||
// Plugin configuration
|
// Plugin configuration
|
||||||
config(config, { command }): UserConfig | Promise<UserConfig> | void {
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
config(config, { command }): any {
|
||||||
const isDev = command === 'serve';
|
const isDev = command === 'serve';
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -85,7 +86,8 @@ export function timeSafariPlugin(options: TimeSafariPluginOptions = {}): Plugin
|
|||||||
},
|
},
|
||||||
|
|
||||||
// Transform code for SSR safety
|
// Transform code for SSR safety
|
||||||
transform(code, _id): { code: string; map: null } | null {
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
transform(code, _id): any {
|
||||||
if (!ssrSafe) return null;
|
if (!ssrSafe) return null;
|
||||||
|
|
||||||
// Check for SSR-unsafe code patterns
|
// Check for SSR-unsafe code patterns
|
||||||
|
|||||||
569
src/web.ts
569
src/web.ts
@@ -1,569 +0,0 @@
|
|||||||
/**
|
|
||||||
* Daily Notification Plugin - Web Implementation
|
|
||||||
*
|
|
||||||
* Web platform implementation for Capacitor Daily Notification Plugin.
|
|
||||||
*
|
|
||||||
* **Note:** Daily notifications are not supported on web platforms.
|
|
||||||
* This implementation provides clear error messages for all methods.
|
|
||||||
*
|
|
||||||
* @author Matthew Raymer
|
|
||||||
* @version 1.0.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
import type {
|
|
||||||
DailyNotificationPlugin,
|
|
||||||
PermissionState,
|
|
||||||
Schedule,
|
|
||||||
ScheduleWithStatus,
|
|
||||||
CreateScheduleInput,
|
|
||||||
Config,
|
|
||||||
CreateConfigInput,
|
|
||||||
Callback,
|
|
||||||
CreateCallbackInput,
|
|
||||||
History,
|
|
||||||
HistoryStats,
|
|
||||||
} from './definitions';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Web implementation of DailyNotificationPlugin
|
|
||||||
*
|
|
||||||
* All methods throw errors indicating that daily notifications
|
|
||||||
* are not supported on web platforms.
|
|
||||||
*/
|
|
||||||
export class DailyNotificationWeb implements DailyNotificationPlugin {
|
|
||||||
private static readonly WEB_NOT_SUPPORTED_ERROR =
|
|
||||||
'Daily notifications are not supported on web platforms. ' +
|
|
||||||
'Please use this plugin on iOS or Android.';
|
|
||||||
|
|
||||||
private throwNotSupported(): never {
|
|
||||||
throw new Error(DailyNotificationWeb.WEB_NOT_SUPPORTED_ERROR);
|
|
||||||
}
|
|
||||||
|
|
||||||
async configure(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async configureNativeFetcher(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async maintainRollingWindow(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getRollingWindowStats(): Promise<{
|
|
||||||
stats: string;
|
|
||||||
maintenanceNeeded: boolean;
|
|
||||||
timeUntilNextMaintenance: number;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getExactAlarmStatus(): Promise<{
|
|
||||||
supported: boolean;
|
|
||||||
enabled: boolean;
|
|
||||||
canSchedule: boolean;
|
|
||||||
fallbackWindow: string;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async requestExactAlarmPermission(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async openExactAlarmSettings(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getRebootRecoveryStatus(): Promise<{
|
|
||||||
inProgress: boolean;
|
|
||||||
lastRecoveryTime: number;
|
|
||||||
timeSinceLastRecovery: number;
|
|
||||||
recoveryNeeded: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async scheduleDailyNotification(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async isAlarmScheduled(): Promise<{ scheduled: boolean; triggerAtMillis: number }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getNextAlarmTime(): Promise<{ scheduled: boolean; triggerAtMillis?: number }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async testAlarm(): Promise<{ scheduled: boolean; secondsFromNow: number; triggerAtMillis: number }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getLastNotification(): Promise<null> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async cancelAllNotifications(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getNotificationStatus(): Promise<{
|
|
||||||
isEnabled?: boolean;
|
|
||||||
isScheduled?: boolean;
|
|
||||||
lastNotificationTime: number | Promise<number>;
|
|
||||||
nextNotificationTime: number | Promise<number>;
|
|
||||||
pending?: number;
|
|
||||||
settings: Record<string, unknown>;
|
|
||||||
error?: string;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateSettings(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getBatteryStatus(): Promise<{
|
|
||||||
level: number;
|
|
||||||
isCharging: boolean;
|
|
||||||
powerState: number;
|
|
||||||
isOptimizationExempt: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async requestBatteryOptimizationExemption(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async setAdaptiveScheduling(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPowerState(): Promise<{
|
|
||||||
powerState: number;
|
|
||||||
isOptimizationExempt: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async checkPermissions(): Promise<{
|
|
||||||
status?: string;
|
|
||||||
granted?: boolean;
|
|
||||||
notifications: PermissionState;
|
|
||||||
backgroundRefresh?: PermissionState;
|
|
||||||
alert?: boolean;
|
|
||||||
badge?: boolean;
|
|
||||||
sound?: boolean;
|
|
||||||
lockScreen?: boolean;
|
|
||||||
carPlay?: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async requestPermissions(): Promise<{
|
|
||||||
status?: string;
|
|
||||||
granted?: boolean;
|
|
||||||
notifications: PermissionState;
|
|
||||||
backgroundRefresh?: PermissionState;
|
|
||||||
alert?: boolean;
|
|
||||||
badge?: boolean;
|
|
||||||
sound?: boolean;
|
|
||||||
lockScreen?: boolean;
|
|
||||||
carPlay?: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async checkPermissionStatus(): Promise<{
|
|
||||||
notificationsEnabled: boolean;
|
|
||||||
exactAlarmEnabled: boolean;
|
|
||||||
wakeLockEnabled: boolean;
|
|
||||||
allPermissionsGranted: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async requestNotificationPermissions(): Promise<{
|
|
||||||
status?: string;
|
|
||||||
granted?: boolean;
|
|
||||||
notifications: PermissionState;
|
|
||||||
backgroundRefresh?: PermissionState;
|
|
||||||
alert?: boolean;
|
|
||||||
badge?: boolean;
|
|
||||||
sound?: boolean;
|
|
||||||
lockScreen?: boolean;
|
|
||||||
carPlay?: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async isChannelEnabled(): Promise<{ enabled: boolean; channelId: string }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async openChannelSettings(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async checkStatus(): Promise<{
|
|
||||||
isEnabled?: boolean;
|
|
||||||
isScheduled?: boolean;
|
|
||||||
lastNotificationTime: number | Promise<number>;
|
|
||||||
nextNotificationTime: number | Promise<number>;
|
|
||||||
pending?: number;
|
|
||||||
settings: Record<string, unknown>;
|
|
||||||
error?: string;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async scheduleContentFetch(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async scheduleUserNotification(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async scheduleDualNotification(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getDualScheduleStatus(): Promise<{
|
|
||||||
contentFetch: {
|
|
||||||
isEnabled: boolean;
|
|
||||||
isScheduled: boolean;
|
|
||||||
lastFetchTime?: number;
|
|
||||||
nextFetchTime?: number;
|
|
||||||
lastFetchResult?: {
|
|
||||||
success: boolean;
|
|
||||||
data?: Record<string, unknown>;
|
|
||||||
timestamp: number;
|
|
||||||
contentAge: number;
|
|
||||||
error?: string;
|
|
||||||
retryCount: number;
|
|
||||||
metadata?: Record<string, unknown>;
|
|
||||||
};
|
|
||||||
pendingFetches: number;
|
|
||||||
};
|
|
||||||
userNotification: {
|
|
||||||
isEnabled: boolean;
|
|
||||||
isScheduled: boolean;
|
|
||||||
lastNotificationTime?: number;
|
|
||||||
nextNotificationTime?: number;
|
|
||||||
pendingNotifications: number;
|
|
||||||
};
|
|
||||||
relationship: {
|
|
||||||
isLinked: boolean;
|
|
||||||
contentAvailable: boolean;
|
|
||||||
lastLinkTime?: number;
|
|
||||||
};
|
|
||||||
overall: {
|
|
||||||
isActive: boolean;
|
|
||||||
lastActivity: number;
|
|
||||||
errorCount: number;
|
|
||||||
successRate: number;
|
|
||||||
};
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateDualScheduleConfig(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async cancelDualSchedule(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async pauseDualSchedule(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async resumeDualSchedule(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getContentCache(): Promise<Record<string, unknown>> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async clearContentCache(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getContentHistory(): Promise<Array<{
|
|
||||||
success: boolean;
|
|
||||||
data?: Record<string, unknown>;
|
|
||||||
timestamp: number;
|
|
||||||
contentAge: number;
|
|
||||||
error?: string;
|
|
||||||
retryCount: number;
|
|
||||||
metadata?: Record<string, unknown>;
|
|
||||||
}>> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async registerCallback(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async unregisterCallback(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getRegisteredCallbacks(): Promise<string[]> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getSchedules(_options?: { kind?: 'fetch' | 'notify'; enabled?: boolean }): Promise<{ schedules: Schedule[] }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getSchedulesWithStatus(_options?: { kind?: 'fetch' | 'notify'; enabled?: boolean }): Promise<{ schedules: ScheduleWithStatus[] }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getSchedule(_id: string): Promise<Schedule | null> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async createSchedule(_schedule: CreateScheduleInput): Promise<Schedule> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateSchedule(_id: string, _updates: unknown): Promise<Schedule> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async deleteSchedule(_id: string): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async enableSchedule(_id: string, _enabled: boolean): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async calculateNextRunTime(_schedule: string): Promise<number> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getContentCacheById(_options?: { id?: string }): Promise<{
|
|
||||||
id: string;
|
|
||||||
fetchedAt: number;
|
|
||||||
ttlSeconds: number;
|
|
||||||
payload: string;
|
|
||||||
meta?: string;
|
|
||||||
} | null> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getLatestContentCache(): Promise<{
|
|
||||||
id: string;
|
|
||||||
fetchedAt: number;
|
|
||||||
ttlSeconds: number;
|
|
||||||
payload: string;
|
|
||||||
meta?: string;
|
|
||||||
} | null> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getContentCacheHistory(_limit?: number): Promise<{ history: Array<{
|
|
||||||
id: string;
|
|
||||||
fetchedAt: number;
|
|
||||||
ttlSeconds: number;
|
|
||||||
payload: string;
|
|
||||||
meta?: string;
|
|
||||||
}> }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async saveContentCache(_content: unknown): Promise<{
|
|
||||||
id: string;
|
|
||||||
fetchedAt: number;
|
|
||||||
ttlSeconds: number;
|
|
||||||
payload: string;
|
|
||||||
meta?: string;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async clearContentCacheEntries(_options?: { olderThan?: number }): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getConfig(_key: string, _options?: { timesafariDid?: string }): Promise<Config | null> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getAllConfigs(_options?: { timesafariDid?: string; configType?: string }): Promise<{ configs: Config[] }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async setConfig(_config: CreateConfigInput): Promise<Config> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateConfig(_key: string, _value: string, _options?: { timesafariDid?: string }): Promise<Config> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async deleteConfig(_key: string, _options?: { timesafariDid?: string }): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCallbacks(_options?: { enabled?: boolean }): Promise<{ callbacks: Callback[] }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCallback(_id: string): Promise<Callback | null> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async registerCallbackConfig(_callback: CreateCallbackInput): Promise<Callback> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateCallback(_id: string, _updates: unknown): Promise<Callback> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async deleteCallback(_id: string): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async enableCallback(_id: string, _enabled: boolean): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getHistoryStats(): Promise<HistoryStats> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getHistory(_options?: { since?: number; kind?: 'fetch' | 'notify' | 'callback'; limit?: number }): Promise<{ history: History[] }> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async setActiveDidFromHost(_activeDid: string): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
onActiveDidChange(_callback: (newActiveDid: string) => Promise<void>): void {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
setJsContentFetcher(_fetcher: unknown): void {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async refreshAuthenticationForNewIdentity(_activeDid: string): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async clearCacheForNewIdentity(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateBackgroundTaskIdentity(_activeDid: string): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateStarredPlans(_options: { planIds: string[] }): Promise<{
|
|
||||||
success: boolean;
|
|
||||||
planIdsCount: number;
|
|
||||||
updatedAt: number;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getStarredPlans(): Promise<{
|
|
||||||
planIds: string[];
|
|
||||||
count: number;
|
|
||||||
updatedAt: number;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async triggerImmediateFetch(): Promise<{
|
|
||||||
success: boolean;
|
|
||||||
message: string;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async scheduleDailyReminder(_options: unknown): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async cancelDailyReminder(_reminderId: string): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getScheduledReminders(): Promise<Array<{
|
|
||||||
id: string;
|
|
||||||
title: string;
|
|
||||||
body: string;
|
|
||||||
time: string;
|
|
||||||
sound: boolean;
|
|
||||||
vibration: boolean;
|
|
||||||
priority: 'low' | 'normal' | 'high';
|
|
||||||
repeatDaily: boolean;
|
|
||||||
timezone?: string;
|
|
||||||
isScheduled: boolean;
|
|
||||||
createdAt: number;
|
|
||||||
}>> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateDailyReminder(_reminderId: string, _options: unknown): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async enableNativeFetcher(_enable: boolean): Promise<{
|
|
||||||
enabled: boolean;
|
|
||||||
registered: boolean;
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async setPolicy(_policy: unknown): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async coordinateBackgroundTasks(): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async handleAppLifecycleEvent(_event: unknown): Promise<void> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCoordinationStatus(): Promise<{
|
|
||||||
platform: 'android' | 'ios' | 'electron';
|
|
||||||
coordinationActive: boolean;
|
|
||||||
coordinationPaused: boolean;
|
|
||||||
autoSync?: boolean;
|
|
||||||
appBackgrounded?: boolean;
|
|
||||||
appHidden?: boolean;
|
|
||||||
visibilityState?: DocumentVisibilityState;
|
|
||||||
focused?: boolean;
|
|
||||||
lastActiveDidChange?: number;
|
|
||||||
lastCoordinationTimestamp?: number;
|
|
||||||
lastAppBackgrounded?: number;
|
|
||||||
lastAppForegrounded?: number;
|
|
||||||
lastCoordinationSuccess?: number;
|
|
||||||
lastCoordinationFailure?: number;
|
|
||||||
coordinationErrors?: string[];
|
|
||||||
}> {
|
|
||||||
this.throwNotSupported();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Export singleton instance
|
|
||||||
const DailyNotification = new DailyNotificationWeb();
|
|
||||||
|
|
||||||
export { DailyNotification };
|
|
||||||
|
|
||||||
@@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
Both test apps are configured to **automatically build the plugin** as part of their build process. The plugin is included as a Gradle project dependency, so Gradle handles building it automatically.
|
Both test apps are configured to **automatically build the plugin** as part of their build process. The plugin is included as a Gradle project dependency, so Gradle handles building it automatically.
|
||||||
|
|
||||||
|
Note that Test App 1 `android-test-app` is used most frequently.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Test App 1: `android-test-app` (Standalone Android)
|
## Test App 1: `android-test-app` (Standalone Android)
|
||||||
@@ -59,7 +61,7 @@ avdmanager list avd
|
|||||||
# Run one
|
# Run one
|
||||||
emulator -avd AVD_NAME
|
emulator -avd AVD_NAME
|
||||||
|
|
||||||
# Check that one is running
|
# Simply see that one is running
|
||||||
adb devices
|
adb devices
|
||||||
|
|
||||||
# Now install on the emulator
|
# Now install on the emulator
|
||||||
|
|||||||
@@ -110,16 +110,20 @@ npx cap run ios
|
|||||||
|
|
||||||
## ⚠️ Why `npm run cap:sync` is Important
|
## ⚠️ Why `npm run cap:sync` is Important
|
||||||
|
|
||||||
**Problem**: `npx cap sync` overwrites `capacitor.plugins.json` and `capacitor.settings.gradle` with incorrect paths.
|
**Problem**: `npx cap sync` overwrites configuration files with incorrect paths:
|
||||||
|
- `capacitor.plugins.json` - Plugin registry gets cleared
|
||||||
|
- `capacitor.settings.gradle` - Android plugin path is wrong
|
||||||
|
- `ios/App/Podfile` - iOS pod name is wrong (`TimesafariDailyNotificationPlugin` instead of `DailyNotificationPlugin`)
|
||||||
|
|
||||||
**Solution**: The `cap:sync` script automatically:
|
**Solution**: The `cap:sync` script automatically:
|
||||||
1. Runs `npx cap sync` (syncs both Android and iOS)
|
1. Runs `npx cap sync` (syncs both Android and iOS)
|
||||||
2. Fixes `capacitor.settings.gradle` (corrects plugin path from `android/` to `android/plugin/`)
|
2. Fixes `capacitor.settings.gradle` (corrects plugin path from `android/plugin/` to `android/`)
|
||||||
3. Restores the DailyNotification plugin entry in `capacitor.plugins.json`
|
3. Restores the DailyNotification plugin entry in `capacitor.plugins.json`
|
||||||
|
4. Fixes `ios/App/Podfile` (corrects pod name and path)
|
||||||
|
|
||||||
**Platform-specific sync:**
|
**Platform-specific sync:**
|
||||||
- `npm run cap:sync:android` - Syncs Android only (includes fix script)
|
- `npm run cap:sync:android` - Syncs Android only (includes fix script)
|
||||||
- `npm run cap:sync:ios` - Syncs iOS only (no fix needed for iOS)
|
- `npm run cap:sync:ios` - Syncs iOS only (includes fix script and runs `pod install`)
|
||||||
|
|
||||||
**Without the fix**: Plugin detection fails, build errors occur, "simplified dialog" appears.
|
**Without the fix**: Plugin detection fails, build errors occur, "simplified dialog" appears.
|
||||||
|
|
||||||
@@ -326,8 +330,8 @@ xcrun simctl spawn booted log stream | grep -i "dailynotification\|capacitor\|pl
|
|||||||
## 📝 Important Notes
|
## 📝 Important Notes
|
||||||
|
|
||||||
**Remember**:
|
**Remember**:
|
||||||
- Use `npm run cap:sync` to sync both platforms (automatically fixes Android configuration files)
|
- Use `npm run cap:sync` to sync both platforms (automatically fixes configuration files)
|
||||||
- Use `npm run cap:sync:android` for Android-only sync (includes fix script)
|
- Use `npm run cap:sync:android` for Android-only sync (includes fix script)
|
||||||
- Use `npm run cap:sync:ios` for iOS-only sync
|
- Use `npm run cap:sync:ios` for iOS-only sync (includes fix script and automatically runs `pod install`)
|
||||||
- Always run `npm run build` before syncing to ensure latest web assets are copied
|
- Always run `npm run build` before syncing to ensure latest web assets are copied
|
||||||
- For iOS: Run `pod install` in `ios/App/` after first sync or when dependencies change
|
- The iOS sync script handles `pod install` automatically, but you can run it manually in `ios/App/` if needed
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
require_relative '../../../../node_modules/@capacitor/ios/scripts/pods_helpers'
|
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||||
|
|
||||||
platform :ios, '13.0'
|
platform :ios, '13.0'
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
@@ -9,8 +9,8 @@ use_frameworks!
|
|||||||
install! 'cocoapods', :disable_input_output_paths => true
|
install! 'cocoapods', :disable_input_output_paths => true
|
||||||
|
|
||||||
def capacitor_pods
|
def capacitor_pods
|
||||||
pod 'Capacitor', :path => '../../../../node_modules/@capacitor/ios'
|
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCordova', :path => '../../../../node_modules/@capacitor/ios'
|
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
|
||||||
pod 'DailyNotificationPlugin', :path => '../../node_modules/@timesafari/daily-notification-plugin/ios'
|
pod 'DailyNotificationPlugin', :path => '../../node_modules/@timesafari/daily-notification-plugin/ios'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
24
test-apps/daily-notification-test/package-lock.json
generated
24
test-apps/daily-notification-test/package-lock.json
generated
@@ -12,6 +12,7 @@
|
|||||||
"@capacitor/android": "^6.2.1",
|
"@capacitor/android": "^6.2.1",
|
||||||
"@capacitor/cli": "^6.2.1",
|
"@capacitor/cli": "^6.2.1",
|
||||||
"@capacitor/core": "^6.2.1",
|
"@capacitor/core": "^6.2.1",
|
||||||
|
"@capacitor/ios": "^6.2.1",
|
||||||
"@timesafari/daily-notification-plugin": "file:../../",
|
"@timesafari/daily-notification-plugin": "file:../../",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
"did-jwt": "^7.4.7",
|
"did-jwt": "^7.4.7",
|
||||||
@@ -117,6 +118,7 @@
|
|||||||
"integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
|
"integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/code-frame": "^7.27.1",
|
"@babel/code-frame": "^7.27.1",
|
||||||
"@babel/generator": "^7.28.3",
|
"@babel/generator": "^7.28.3",
|
||||||
@@ -416,6 +418,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
|
||||||
"integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
|
"integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/types": "^7.28.4"
|
"@babel/types": "^7.28.4"
|
||||||
},
|
},
|
||||||
@@ -634,10 +637,20 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-6.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-6.2.1.tgz",
|
||||||
"integrity": "sha512-urZwxa7hVE/BnA18oCFAdizXPse6fCKanQyEqpmz6cBJ2vObwMpyJDG5jBeoSsgocS9+Ax+9vb4ducWJn0y2qQ==",
|
"integrity": "sha512-urZwxa7hVE/BnA18oCFAdizXPse6fCKanQyEqpmz6cBJ2vObwMpyJDG5jBeoSsgocS9+Ax+9vb4ducWJn0y2qQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.1.0"
|
"tslib": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@capacitor/ios": {
|
||||||
|
"version": "6.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-6.2.1.tgz",
|
||||||
|
"integrity": "sha512-tbMlQdQjxe1wyaBvYVU1yTojKJjgluZQsJkALuJxv/6F8QTw5b6vd7X785O/O7cMpIAZfUWo/vtAHzFkRV+kXw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"peerDependencies": {
|
||||||
|
"@capacitor/core": "^6.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@esbuild/aix-ppc64": {
|
"node_modules/@esbuild/aix-ppc64": {
|
||||||
"version": "0.25.11",
|
"version": "0.25.11",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.11.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.11.tgz",
|
||||||
@@ -2065,6 +2078,7 @@
|
|||||||
"integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==",
|
"integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@typescript-eslint/scope-manager": "8.46.1",
|
"@typescript-eslint/scope-manager": "8.46.1",
|
||||||
"@typescript-eslint/types": "8.46.1",
|
"@typescript-eslint/types": "8.46.1",
|
||||||
@@ -2663,6 +2677,7 @@
|
|||||||
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"acorn": "bin/acorn"
|
"acorn": "bin/acorn"
|
||||||
},
|
},
|
||||||
@@ -2911,6 +2926,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"baseline-browser-mapping": "^2.8.9",
|
"baseline-browser-mapping": "^2.8.9",
|
||||||
"caniuse-lite": "^1.0.30001746",
|
"caniuse-lite": "^1.0.30001746",
|
||||||
@@ -3373,6 +3389,7 @@
|
|||||||
"integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==",
|
"integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.8.0",
|
"@eslint-community/eslint-utils": "^4.8.0",
|
||||||
"@eslint-community/regexpp": "^4.12.1",
|
"@eslint-community/regexpp": "^4.12.1",
|
||||||
@@ -3434,6 +3451,7 @@
|
|||||||
"integrity": "sha512-K6tP0dW8FJVZLQxa2S7LcE1lLw3X8VvB3t887Q6CLrFVxHYBXGANbXvwNzYIu6Ughx1bSJ5BDT0YB3ybPT39lw==",
|
"integrity": "sha512-K6tP0dW8FJVZLQxa2S7LcE1lLw3X8VvB3t887Q6CLrFVxHYBXGANbXvwNzYIu6Ughx1bSJ5BDT0YB3ybPT39lw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint-community/eslint-utils": "^4.4.0",
|
"@eslint-community/eslint-utils": "^4.4.0",
|
||||||
"natural-compare": "^1.4.0",
|
"natural-compare": "^1.4.0",
|
||||||
@@ -4293,6 +4311,7 @@
|
|||||||
"integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
|
"integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"jiti": "lib/jiti-cli.mjs"
|
"jiti": "lib/jiti-cli.mjs"
|
||||||
}
|
}
|
||||||
@@ -5721,6 +5740,7 @@
|
|||||||
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12"
|
"node": ">=12"
|
||||||
},
|
},
|
||||||
@@ -5798,6 +5818,7 @@
|
|||||||
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
|
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
|
||||||
"devOptional": true,
|
"devOptional": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"tsc": "bin/tsc",
|
"tsc": "bin/tsc",
|
||||||
"tsserver": "bin/tsserver"
|
"tsserver": "bin/tsserver"
|
||||||
@@ -6031,6 +6052,7 @@
|
|||||||
"integrity": "sha512-CmuvUBzVJ/e3HGxhg6cYk88NGgTnBoOo7ogtfJJ0fefUWAxN/WDSUa50o+oVBxuIhO8FoEZW0j2eW7sfjs5EtA==",
|
"integrity": "sha512-CmuvUBzVJ/e3HGxhg6cYk88NGgTnBoOo7ogtfJJ0fefUWAxN/WDSUa50o+oVBxuIhO8FoEZW0j2eW7sfjs5EtA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.25.0",
|
"esbuild": "^0.25.0",
|
||||||
"fdir": "^6.5.0",
|
"fdir": "^6.5.0",
|
||||||
@@ -6301,6 +6323,7 @@
|
|||||||
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=12"
|
"node": ">=12"
|
||||||
},
|
},
|
||||||
@@ -6320,6 +6343,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.22.tgz",
|
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.22.tgz",
|
||||||
"integrity": "sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==",
|
"integrity": "sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/compiler-dom": "3.5.22",
|
"@vue/compiler-dom": "3.5.22",
|
||||||
"@vue/compiler-sfc": "3.5.22",
|
"@vue/compiler-sfc": "3.5.22",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
"lint": "eslint . --fix",
|
"lint": "eslint . --fix",
|
||||||
"cap:sync": "npx cap sync && node scripts/fix-capacitor-plugins.js",
|
"cap:sync": "npx cap sync && node scripts/fix-capacitor-plugins.js",
|
||||||
"cap:sync:android": "npx cap sync android && node scripts/fix-capacitor-plugins.js",
|
"cap:sync:android": "npx cap sync android && node scripts/fix-capacitor-plugins.js",
|
||||||
"cap:sync:ios": "npx cap sync ios",
|
"cap:sync:ios": "node scripts/fix-capacitor-plugins.js && (npx cap sync ios || true) && node scripts/fix-capacitor-plugins.js && cd ios/App && pod install && cd ../..",
|
||||||
"postinstall": "node scripts/fix-capacitor-plugins.js"
|
"postinstall": "node scripts/fix-capacitor-plugins.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -36,6 +36,13 @@ function fixCapacitorPlugins() {
|
|||||||
console.log('🔧 Fixing capacitor.plugins.json...');
|
console.log('🔧 Fixing capacitor.plugins.json...');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// Ensure directory exists before writing
|
||||||
|
const pluginsDir = path.dirname(PLUGINS_JSON_PATH);
|
||||||
|
if (!fs.existsSync(pluginsDir)) {
|
||||||
|
fs.mkdirSync(pluginsDir, { recursive: true });
|
||||||
|
console.log('ℹ️ Created assets directory:', pluginsDir);
|
||||||
|
}
|
||||||
|
|
||||||
// Read current content
|
// Read current content
|
||||||
let plugins = [];
|
let plugins = [];
|
||||||
if (fs.existsSync(PLUGINS_JSON_PATH)) {
|
if (fs.existsSync(PLUGINS_JSON_PATH)) {
|
||||||
@@ -56,7 +63,8 @@ function fixCapacitorPlugins() {
|
|||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Error fixing capacitor.plugins.json:', error.message);
|
console.error('❌ Error fixing capacitor.plugins.json:', error.message);
|
||||||
process.exit(1);
|
// Don't exit on error - this might run before cap sync creates the file
|
||||||
|
console.log('ℹ️ This is normal if Capacitor hasn\'t synced yet. Run "npx cap sync android" first.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,14 +127,18 @@ function fixPodfile() {
|
|||||||
let content = fs.readFileSync(PODFILE_PATH, 'utf8');
|
let content = fs.readFileSync(PODFILE_PATH, 'utf8');
|
||||||
const originalContent = content;
|
const originalContent = content;
|
||||||
|
|
||||||
// The correct pod reference should be:
|
// Determine correct path - check if plugin is in node_modules or use relative path for file dependencies
|
||||||
// pod 'DailyNotificationPlugin', :path => '../../node_modules/@timesafari/daily-notification-plugin/ios'
|
// From ios/App/Podfile: ../../../../ios points to plugin root's ios directory
|
||||||
const correctPodLine = "pod 'DailyNotificationPlugin', :path => '../../node_modules/@timesafari/daily-notification-plugin/ios'";
|
const nodeModulesPath = '../../node_modules/@timesafari/daily-notification-plugin/ios';
|
||||||
|
const relativePath = '../../../../ios';
|
||||||
|
const correctPodLine = fs.existsSync(path.join(path.dirname(PODFILE_PATH), nodeModulesPath, 'DailyNotificationPlugin.podspec'))
|
||||||
|
? `pod 'DailyNotificationPlugin', :path => '${nodeModulesPath}'`
|
||||||
|
: `pod 'DailyNotificationPlugin', :path => '${relativePath}'`;
|
||||||
|
|
||||||
// Check if Podfile already has the correct reference
|
// Check if Podfile already has the correct reference
|
||||||
if (content.includes("pod 'DailyNotificationPlugin'")) {
|
if (content.includes("pod 'DailyNotificationPlugin'")) {
|
||||||
// Check if path is correct
|
// Check if path is correct (either node_modules or relative path)
|
||||||
if (content.includes('@timesafari/daily-notification-plugin/ios')) {
|
if (content.includes('@timesafari/daily-notification-plugin/ios') || content.includes("'../../../../ios'")) {
|
||||||
console.log('✅ Podfile has correct DailyNotificationPlugin reference');
|
console.log('✅ Podfile has correct DailyNotificationPlugin reference');
|
||||||
} else {
|
} else {
|
||||||
// Fix the path
|
// Fix the path
|
||||||
|
|||||||
@@ -40,6 +40,9 @@ export interface ScheduleResponse {
|
|||||||
export interface PermissionStatus {
|
export interface PermissionStatus {
|
||||||
notifications: 'granted' | 'denied'
|
notifications: 'granted' | 'denied'
|
||||||
notificationsEnabled: boolean
|
notificationsEnabled: boolean
|
||||||
|
exactAlarmEnabled?: boolean
|
||||||
|
wakeLockEnabled?: boolean
|
||||||
|
allPermissionsGranted?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface NotificationStatus {
|
export interface NotificationStatus {
|
||||||
|
|||||||
@@ -402,9 +402,9 @@ const checkAndRequestPermissions = async (): Promise<void> => {
|
|||||||
// Request permissions - this will show the iOS system dialog
|
// Request permissions - this will show the iOS system dialog
|
||||||
// Try requestNotificationPermissions first (iOS), fallback to requestPermissions
|
// Try requestNotificationPermissions first (iOS), fallback to requestPermissions
|
||||||
if (typeof (plugin as any).requestNotificationPermissions === 'function') {
|
if (typeof (plugin as any).requestNotificationPermissions === 'function') {
|
||||||
await (plugin as { requestNotificationPermissions: () => Promise<void> }).requestNotificationPermissions()
|
await (plugin as any).requestNotificationPermissions()
|
||||||
} else if (typeof (plugin as any).requestPermissions === 'function') {
|
} else if (typeof (plugin as any).requestPermissions === 'function') {
|
||||||
await (plugin as { requestPermissions: () => Promise<any> }).requestPermissions()
|
await (plugin as any).requestPermissions()
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Permission request method not available')
|
throw new Error('Permission request method not available')
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user