Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d87288f2f | ||
|
|
cda28cc6be | ||
|
|
df23c84474 | ||
|
|
2508c77f17 | ||
|
|
607e1236f7 | ||
|
|
204857cdd9 |
@@ -0,0 +1,51 @@
|
||||
name: Build
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main]
|
||||
push:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
macos:
|
||||
runs-on: macos-arm64
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build Meetingnotes
|
||||
run: >-
|
||||
xcodebuild
|
||||
-project Meetingnotes.xcodeproj
|
||||
-scheme meetingnotes
|
||||
-configuration Release
|
||||
-destination 'generic/platform=macOS'
|
||||
-derivedDataPath "$RUNNER_TEMP/DerivedData"
|
||||
ARCHS="arm64 x86_64"
|
||||
ONLY_ACTIVE_ARCH=NO
|
||||
PRODUCT_BUNDLE_IDENTIFIER=net.jamesbone.meetingnotes.ci
|
||||
CODE_SIGNING_ALLOWED=NO
|
||||
build
|
||||
- name: Sign test build
|
||||
run: |
|
||||
app_path="$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app"
|
||||
codesign --force --deep --sign - \
|
||||
--entitlements meetingnotes/meetingnotes.entitlements \
|
||||
"$app_path"
|
||||
codesign --verify --deep --strict "$app_path"
|
||||
codesign -d --entitlements :- "$app_path" 2>&1 \
|
||||
| grep -q 'com.apple.security.network.server'
|
||||
- name: Smoke test local API
|
||||
run: python3 scripts/smoke_test_api.py "$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app"
|
||||
- name: Package test build
|
||||
if: always()
|
||||
run: |
|
||||
app_path="$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app"
|
||||
ditto -c -k --sequesterRsrc --keepParent \
|
||||
"$app_path" "$RUNNER_TEMP/Meetingnotes-macOS.zip"
|
||||
- name: Upload test build
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Meetingnotes-macOS-${{ github.sha }}
|
||||
path: ${{ runner.temp }}/Meetingnotes-macOS.zip
|
||||
retention-days: 30
|
||||
@@ -0,0 +1,47 @@
|
||||
name: Release
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: Version from MARKETING_VERSION, without the v prefix
|
||||
required: true
|
||||
type: string
|
||||
permissions:
|
||||
contents: write
|
||||
concurrency:
|
||||
group: meetingnotes-release
|
||||
cancel-in-progress: false
|
||||
jobs:
|
||||
release:
|
||||
runs-on: macos-arm64
|
||||
env:
|
||||
VERSION: ${{ inputs.version }}
|
||||
RELEASE_BASE_URL: https://git.jamesbone.net/coder/meetingnotes
|
||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
||||
APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
|
||||
SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
|
||||
steps:
|
||||
- name: Require main
|
||||
run: test "$GITHUB_REF" = refs/heads/main
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Build, sign, and notarize release
|
||||
timeout-minutes: 45
|
||||
env:
|
||||
APPLE_CERTIFICATE_P12: ${{ secrets.APPLE_CERTIFICATE_P12 }}
|
||||
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
|
||||
run: python3 scripts/with_signing_identity.py scripts/package_release.sh
|
||||
- name: Preserve signed release artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: meetingnotes-signed-release-${{ github.run_id }}
|
||||
path: ${{ runner.temp }}/meetingnotes-release/release
|
||||
if-no-files-found: error
|
||||
retention-days: 30
|
||||
- name: Publish Gitea release
|
||||
env:
|
||||
GITEA_SERVER_URL: ${{ github.server_url }}
|
||||
GITEA_TOKEN: ${{ github.token }}
|
||||
run: python3 scripts/publish_gitea_release.py
|
||||
@@ -276,7 +276,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 42;
|
||||
CURRENT_PROJECT_VERSION = 45;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -290,7 +290,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||
MARKETING_VERSION = 1.1.30;
|
||||
MARKETING_VERSION = 1.1.33;
|
||||
ONLY_ACTIVE_ARCH = NO;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
||||
@@ -312,7 +312,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 42;
|
||||
CURRENT_PROJECT_VERSION = 45;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = G9LVHZAJNX;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -326,7 +326,7 @@
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MACOSX_DEPLOYMENT_TARGET = 15.0;
|
||||
MARKETING_VERSION = 1.1.30;
|
||||
MARKETING_VERSION = 1.1.33;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
|
||||
|
||||
@@ -46,7 +46,7 @@ Later:
|
||||
## Releasing a New Version
|
||||
|
||||
Production releases are Developer ID signed, notarized by Apple, published to
|
||||
GitHub Releases, and signed for Sparkle auto-updates.
|
||||
[Gitea Releases](https://git.jamesbone.net/coder/meetingnotes/releases), and signed for Sparkle auto-updates.
|
||||
|
||||
### Release Process
|
||||
|
||||
@@ -68,12 +68,12 @@ GitHub Releases, and signed for Sparkle auto-updates.
|
||||
|
||||
2. Commit and push the version change to `main`.
|
||||
|
||||
3. Run the `Release` workflow from GitHub Actions and enter the version without
|
||||
3. Run the `Release` workflow from Gitea Actions on `main` and enter the version without
|
||||
the `v` prefix. The workflow signs and notarizes the app, generates the
|
||||
signed appcast, creates the version tag, and publishes both release assets.
|
||||
|
||||
The app checks
|
||||
`https://github.com/superdooper86/meetingnotes/releases/latest/download/appcast.xml`
|
||||
`https://git.jamesbone.net/coder/meetingnotes/releases/download/latest/appcast.xml`
|
||||
and installs later releases automatically through Sparkle.
|
||||
|
||||
### Recovering Meetings
|
||||
@@ -82,3 +82,18 @@ The first Developer ID signed build may not automatically inherit data from an
|
||||
older ad-hoc signed build. In Settings, use **Import Meetings...** and select the
|
||||
old `Meetings` folder. After this one-time transition, the stable signing
|
||||
identity keeps the same sandbox container across updates.
|
||||
|
||||
### Build runner and GitHub transition
|
||||
|
||||
`.gitea/workflows/build.yml` builds universal macOS artifacts for pushes and pull
|
||||
requests to `main`. The repository-scoped `mac-mini-meetingnotes` runner uses the
|
||||
`macos-arm64` label. Smoke tests use a separate CI bundle identifier and temporary
|
||||
launch preferences. Release jobs import the original Developer ID certificate
|
||||
into a temporary keychain and keep the original Sparkle signing key in Gitea
|
||||
Actions secrets. They never publish from a development branch.
|
||||
|
||||
Version 1.1.33 moves the embedded update feed to Gitea. After its notarized archive
|
||||
is verified, replace the `appcast.xml` asset on the last GitHub release with the
|
||||
new appcast. Existing installations discover the Gitea download through that old
|
||||
GitHub feed; after installing it, they check Gitea directly. Keep the old GitHub
|
||||
repository and its release appcast available for installations that update later.
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Meetingnotes needs access to your microphone for transcription.</string>
|
||||
<key>SUFeedURL</key>
|
||||
<string>https://github.com/superdooper86/meetingnotes/releases/latest/download/appcast.xml</string>
|
||||
<string>https://git.jamesbone.net/coder/meetingnotes/releases/download/latest/appcast.xml</string>
|
||||
<key>SUPublicEDKey</key>
|
||||
<string>9ZuN9G9ERB3Qoyyd/4FsF+6LMUv5jzAGP26OXAHBiW0=</string>
|
||||
<key>SUEnableAutomaticChecks</key>
|
||||
|
||||
@@ -27,6 +27,7 @@ private struct SystemCaptureDiagnostics {
|
||||
var targetFormat = "unavailable"
|
||||
var selectedInputSampleRate: Double?
|
||||
var targetSampleRate: Double?
|
||||
var inputRateInference = "unavailable"
|
||||
var firstBufferLayout: String?
|
||||
var callbackCount: UInt64 = 0
|
||||
var inputFrameCount: UInt64 = 0
|
||||
@@ -72,7 +73,7 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
private var recordingStartedAt = Date()
|
||||
private var systemDiagnostics = SystemCaptureDiagnostics()
|
||||
|
||||
private override init() {
|
||||
override init() {
|
||||
super.init()
|
||||
observeAudioEngine()
|
||||
}
|
||||
@@ -443,18 +444,70 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
systemDiagnostics.targetSampleRate = targetFormat.sampleRate
|
||||
var inputFormat: AVAudioFormat?
|
||||
var converter: AVAudioConverter?
|
||||
var pendingBuffer: AVAudioPCMBuffer?
|
||||
var pendingInputTime: AudioTimeStamp?
|
||||
var pendingNow: AudioTimeStamp?
|
||||
try tap.run(on: tapQueue) { [weak self] inNow, inputData, inInputTime, _, _ in
|
||||
guard let self else { return }
|
||||
if inputFormat == nil {
|
||||
guard let callbackFormat = self.inputFormat(
|
||||
for: inputData,
|
||||
sampleRate: advertisedInputFormat.sampleRate
|
||||
),
|
||||
let currentBuffer = self.copyAudioBuffer(from: inputData, format: callbackFormat) else {
|
||||
self.systemDiagnostics.discardedCallbackCount += 1
|
||||
return
|
||||
}
|
||||
|
||||
guard let previousBuffer = pendingBuffer,
|
||||
let previousInputTime = pendingInputTime,
|
||||
let previousNow = pendingNow else {
|
||||
pendingBuffer = currentBuffer
|
||||
pendingInputTime = inInputTime.pointee
|
||||
pendingNow = inNow.pointee
|
||||
return
|
||||
}
|
||||
|
||||
let selectedSampleRate = self.effectiveInputSampleRate(
|
||||
advertisedSampleRate: advertisedInputFormat.sampleRate,
|
||||
previousFrameLength: previousBuffer.frameLength,
|
||||
previousTimestamp: previousInputTime,
|
||||
currentTimestamp: inInputTime.pointee,
|
||||
previousHostTimestamp: previousNow,
|
||||
currentHostTimestamp: inNow.pointee
|
||||
)
|
||||
inputFormat = self.inputFormat(
|
||||
for: inputData,
|
||||
advertisedFormat: advertisedInputFormat
|
||||
sampleRate: selectedSampleRate
|
||||
)
|
||||
if let inputFormat {
|
||||
self.systemDiagnostics.selectedInputFormat = self.audioFormatSummary(inputFormat)
|
||||
self.systemDiagnostics.selectedInputSampleRate = inputFormat.sampleRate
|
||||
converter = AVAudioConverter(from: inputFormat, to: targetFormat)
|
||||
}
|
||||
|
||||
guard let inputFormat, let converter else { return }
|
||||
self.processAudioBuffer(
|
||||
{ self.copyAudioBuffer(from: previousBuffer.audioBufferList, format: inputFormat) },
|
||||
converter: converter,
|
||||
targetFormat: targetFormat,
|
||||
source: .system,
|
||||
callbackTimestamp: previousInputTime,
|
||||
ioTimestamp: pendingNow
|
||||
)
|
||||
pendingBuffer = nil
|
||||
pendingInputTime = nil
|
||||
pendingNow = nil
|
||||
|
||||
self.processAudioBuffer(
|
||||
{ self.copyAudioBuffer(from: currentBuffer.audioBufferList, format: inputFormat) },
|
||||
converter: converter,
|
||||
targetFormat: targetFormat,
|
||||
source: .system,
|
||||
callbackTimestamp: inInputTime.pointee,
|
||||
ioTimestamp: inNow.pointee
|
||||
)
|
||||
return
|
||||
}
|
||||
guard let inputFormat, let converter else { return }
|
||||
// The tap queue is serial. Reusing the converter preserves its
|
||||
@@ -475,7 +528,7 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
|
||||
private func inputFormat(
|
||||
for inputData: UnsafePointer<AudioBufferList>,
|
||||
advertisedFormat: AVAudioFormat
|
||||
sampleRate: Double
|
||||
) -> AVAudioFormat? {
|
||||
let buffers = UnsafeMutableAudioBufferListPointer(
|
||||
UnsafeMutablePointer(mutating: inputData)
|
||||
@@ -492,12 +545,67 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
let isInterleaved = buffers.count == 1 && channelCount > 1
|
||||
return AVAudioFormat(
|
||||
commonFormat: .pcmFormatFloat32,
|
||||
sampleRate: advertisedFormat.sampleRate,
|
||||
sampleRate: sampleRate,
|
||||
channels: AVAudioChannelCount(channelCount),
|
||||
interleaved: isInterleaved
|
||||
)
|
||||
}
|
||||
|
||||
private func effectiveInputSampleRate(
|
||||
advertisedSampleRate: Double,
|
||||
previousFrameLength: AVAudioFrameCount,
|
||||
previousTimestamp: AudioTimeStamp,
|
||||
currentTimestamp: AudioTimeStamp,
|
||||
previousHostTimestamp: AudioTimeStamp,
|
||||
currentHostTimestamp: AudioTimeStamp
|
||||
) -> Double {
|
||||
let sampleTimeDelta = currentTimestamp.mSampleTime - previousTimestamp.mSampleTime
|
||||
guard advertisedSampleRate > 0, previousFrameLength > 0 else {
|
||||
systemDiagnostics.inputRateInference = "advertised (invalid advertised rate or frame count)"
|
||||
return advertisedSampleRate
|
||||
}
|
||||
|
||||
guard currentHostTimestamp.mHostTime > previousHostTimestamp.mHostTime else {
|
||||
systemDiagnostics.inputRateInference = "advertised (host timestamps unavailable)"
|
||||
return advertisedSampleRate
|
||||
}
|
||||
let hostTimeDelta = currentHostTimestamp.mHostTime - previousHostTimestamp.mHostTime
|
||||
let hostNanoseconds = AudioConvertHostTimeToNanos(hostTimeDelta)
|
||||
guard hostNanoseconds > 0 else {
|
||||
systemDiagnostics.inputRateInference = "advertised (host-time conversion failed)"
|
||||
return advertisedSampleRate
|
||||
}
|
||||
|
||||
let inferredSampleRate = Double(previousFrameLength) * 1_000_000_000 / Double(hostNanoseconds)
|
||||
let plausibleRange = (advertisedSampleRate * 0.25)...(advertisedSampleRate * 1.25)
|
||||
guard inferredSampleRate.isFinite, plausibleRange.contains(inferredSampleRate) else {
|
||||
systemDiagnostics.inputRateInference = String(
|
||||
format: "advertised (invalid host inference %.3f from %u frames / %llu ns; sampleTimeDelta=%.3f)",
|
||||
inferredSampleRate,
|
||||
previousFrameLength,
|
||||
hostNanoseconds,
|
||||
sampleTimeDelta
|
||||
)
|
||||
return advertisedSampleRate
|
||||
}
|
||||
|
||||
let commonSampleRates: [Double] = [8_000, 11_025, 12_000, 16_000, 22_050, 24_000, 32_000, 44_100, 48_000, 88_200, 96_000]
|
||||
let selectedSampleRate = commonSampleRates
|
||||
.min(by: { abs($0 - inferredSampleRate) < abs($1 - inferredSampleRate) })
|
||||
.flatMap { abs($0 - inferredSampleRate) / $0 <= 0.01 ? $0 : nil }
|
||||
?? inferredSampleRate
|
||||
systemDiagnostics.inputRateInference = String(
|
||||
format: "source=hostTime,advertised=%.3f,inferred=%.3f,selected=%.3f,previousFrames=%u,hostNanoseconds=%llu,sampleTimeDelta=%.3f",
|
||||
advertisedSampleRate,
|
||||
inferredSampleRate,
|
||||
selectedSampleRate,
|
||||
previousFrameLength,
|
||||
hostNanoseconds,
|
||||
sampleTimeDelta
|
||||
)
|
||||
return selectedSampleRate
|
||||
}
|
||||
|
||||
private func copyAudioBuffer(
|
||||
from inputData: UnsafePointer<AudioBufferList>,
|
||||
format: AVAudioFormat
|
||||
@@ -863,6 +971,7 @@ final class AudioManager: NSObject, ObservableObject {
|
||||
"tapAdvertisedFormat=\(systemDiagnostics.tapAdvertisedFormat)",
|
||||
"aggregateInputFormat=\(systemDiagnostics.aggregateInputFormat)",
|
||||
"selectedInputFormat=\(systemDiagnostics.selectedInputFormat)",
|
||||
"inputRateInference=\(systemDiagnostics.inputRateInference)",
|
||||
"targetFormat=\(systemDiagnostics.targetFormat)",
|
||||
"firstBufferLayout=\(systemDiagnostics.firstBufferLayout ?? "unavailable")",
|
||||
"callbackCount=\(systemDiagnostics.callbackCount)",
|
||||
|
||||
@@ -2,6 +2,12 @@ import Foundation
|
||||
import SwiftUI
|
||||
import Combine
|
||||
|
||||
struct RecordingCompletion {
|
||||
let chunks: [TranscriptChunk]
|
||||
let recoveryAudioFolderName: String?
|
||||
let transcriptionError: String?
|
||||
}
|
||||
|
||||
/// Manages recording sessions at the app level to persist across navigation
|
||||
@MainActor
|
||||
class RecordingSessionManager: ObservableObject {
|
||||
@@ -14,9 +20,11 @@ class RecordingSessionManager: ObservableObject {
|
||||
@Published var errorMessage: String?
|
||||
@Published var activeRecordingTranscriptChunksUpdated: [TranscriptChunk] = []
|
||||
|
||||
private let audioManager = AudioManager.shared
|
||||
private var audioManager = AudioManager.shared
|
||||
private var cancellables = Set<AnyCancellable>()
|
||||
private var audioManagerCancellables = Set<AnyCancellable>()
|
||||
private let transcriptUpdateSubject = PassthroughSubject<[TranscriptChunk], Never>()
|
||||
private var processingMeetingIds = Set<UUID>()
|
||||
|
||||
// Store transcript chunks for the active recording session
|
||||
private var activeRecordingTranscriptChunks: [TranscriptChunk] = []
|
||||
@@ -27,24 +35,19 @@ class RecordingSessionManager: ObservableObject {
|
||||
}
|
||||
|
||||
private func setupAudioManagerBindings() {
|
||||
audioManagerCancellables.removeAll()
|
||||
// Bind to audio manager state
|
||||
audioManager.$isRecording
|
||||
.sink { [weak self] isRecording in
|
||||
self?.isRecording = isRecording
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
|
||||
audioManager.$isProcessing
|
||||
.sink { [weak self] isProcessing in
|
||||
self?.isProcessing = isProcessing
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
.store(in: &audioManagerCancellables)
|
||||
|
||||
audioManager.$errorMessage
|
||||
.sink { [weak self] errorMessage in
|
||||
self?.errorMessage = errorMessage
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
.store(in: &audioManagerCancellables)
|
||||
|
||||
// When transcript chunks change, store them for the active recording and send to debouncer
|
||||
audioManager.$transcriptChunks
|
||||
@@ -55,7 +58,7 @@ class RecordingSessionManager: ObservableObject {
|
||||
|
||||
self.transcriptUpdateSubject.send(newChunks)
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
.store(in: &audioManagerCancellables)
|
||||
}
|
||||
|
||||
private func setupDebouncedSaving() {
|
||||
@@ -84,26 +87,40 @@ class RecordingSessionManager: ObservableObject {
|
||||
audioManager.startRecording(for: meetingId)
|
||||
}
|
||||
|
||||
func stopRecording() async -> [TranscriptChunk] {
|
||||
func stopRecording() async -> RecordingCompletion {
|
||||
print("🛑 Stopping recording for meeting: \(activeMeetingId?.uuidString ?? "unknown")")
|
||||
|
||||
guard let meetingId = activeMeetingId else {
|
||||
audioManager.cancelRecording()
|
||||
recordingStartedAt = nil
|
||||
return []
|
||||
return RecordingCompletion(chunks: [], recoveryAudioFolderName: nil, transcriptionError: nil)
|
||||
}
|
||||
|
||||
let completedAudioManager = audioManager
|
||||
audioManager = AudioManager()
|
||||
setupAudioManagerBindings()
|
||||
activeMeetingId = nil
|
||||
recordingStartedAt = nil
|
||||
let chunks = await audioManager.stopRecordingAndTranscribe()
|
||||
activeRecordingTranscriptChunks = chunks
|
||||
activeRecordingTranscriptChunksUpdated = chunks
|
||||
processingMeetingIds.insert(meetingId)
|
||||
isProcessing = true
|
||||
defer {
|
||||
processingMeetingIds.remove(meetingId)
|
||||
isProcessing = !processingMeetingIds.isEmpty
|
||||
}
|
||||
|
||||
let chunks = await completedAudioManager.stopRecordingAndTranscribe()
|
||||
let completion = RecordingCompletion(
|
||||
chunks: chunks,
|
||||
recoveryAudioFolderName: completedAudioManager.lastRecoveryAudioFolderName,
|
||||
transcriptionError: completedAudioManager.errorMessage
|
||||
)
|
||||
updateActiveMeetingTranscript(
|
||||
meetingId: meetingId,
|
||||
chunks: chunks,
|
||||
transcriptionError: audioManager.errorMessage
|
||||
recoveryAudioFolderName: completion.recoveryAudioFolderName,
|
||||
transcriptionError: completion.transcriptionError
|
||||
)
|
||||
activeMeetingId = nil
|
||||
activeRecordingTranscriptChunks = []
|
||||
return chunks
|
||||
return completion
|
||||
}
|
||||
|
||||
func cancelRecording() {
|
||||
@@ -117,13 +134,14 @@ class RecordingSessionManager: ObservableObject {
|
||||
return isRecording && activeMeetingId == meetingId
|
||||
}
|
||||
|
||||
var lastRecoveryAudioFolderName: String? {
|
||||
audioManager.lastRecoveryAudioFolderName
|
||||
func isProcessingMeeting(_ meetingId: UUID) -> Bool {
|
||||
processingMeetingIds.contains(meetingId)
|
||||
}
|
||||
|
||||
|
||||
private func updateActiveMeetingTranscript(
|
||||
meetingId: UUID,
|
||||
chunks: [TranscriptChunk],
|
||||
recoveryAudioFolderName: String? = nil,
|
||||
transcriptionError: String? = nil
|
||||
) {
|
||||
// Load all meetings
|
||||
@@ -132,7 +150,7 @@ class RecordingSessionManager: ObservableObject {
|
||||
// Find and update the active meeting
|
||||
if let index = meetings.firstIndex(where: { $0.id == meetingId }) {
|
||||
meetings[index].transcriptChunks = chunks
|
||||
if let recoveryAudioFolderName = lastRecoveryAudioFolderName {
|
||||
if let recoveryAudioFolderName {
|
||||
meetings[index].recoveryAudioFolderName = recoveryAudioFolderName
|
||||
}
|
||||
meetings[index].transcriptionError = transcriptionError
|
||||
|
||||
@@ -30,6 +30,7 @@ enum CoderAPIError: LocalizedError {
|
||||
case missingModel(String)
|
||||
case invalidResponse
|
||||
case serviceError(Int, String)
|
||||
case audioPreparationFailed(String, String)
|
||||
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
@@ -43,6 +44,8 @@ enum CoderAPIError: LocalizedError {
|
||||
return "Coder returned an invalid response."
|
||||
case .serviceError(let status, let message):
|
||||
return "Coder request failed (\(status)): \(message)"
|
||||
case .audioPreparationFailed(let filename, let message):
|
||||
return "Could not prepare \(filename) for transcription: \(message)"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -179,7 +182,12 @@ final class CoderAPIClient {
|
||||
let selectedModel = model.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard !selectedModel.isEmpty else { throw CoderAPIError.missingModel("transcription") }
|
||||
let apiKey = try requiredAPIKey(KeychainHelper.shared.getCoderAPIKey() ?? "")
|
||||
let chunks = try makeAudioChunks(from: fileURL, preserveSpeakerIdentity: diarization)
|
||||
let chunks: [AudioChunk]
|
||||
do {
|
||||
chunks = try makeAudioChunks(from: fileURL, preserveSpeakerIdentity: diarization)
|
||||
} catch {
|
||||
throw CoderAPIError.audioPreparationFailed(fileURL.lastPathComponent, error.localizedDescription)
|
||||
}
|
||||
defer {
|
||||
for chunk in chunks where chunk.isTemporary {
|
||||
try? FileManager.default.removeItem(at: chunk.url)
|
||||
@@ -260,13 +268,38 @@ final class CoderAPIClient {
|
||||
let size = attributes[.size] as? NSNumber {
|
||||
request.setValue(size.stringValue, forHTTPHeaderField: "Content-Length")
|
||||
}
|
||||
let (data, response) = try await transcriptionSession.upload(for: request, fromFile: bodyURL)
|
||||
let (data, response) = try await uploadTranscription(request: request, bodyURL: bodyURL)
|
||||
try validate(response: response, data: data)
|
||||
let decoded = try JSONDecoder().decode(TranscriptionResponse.self, from: data)
|
||||
let segments = decoded.segments ?? segments(from: decoded.words ?? [])
|
||||
return Transcription(text: decoded.text, segments: segments)
|
||||
}
|
||||
|
||||
private func uploadTranscription(request: URLRequest, bodyURL: URL) async throws -> (Data, URLResponse) {
|
||||
let retryDelays: [UInt64] = [3, 10]
|
||||
for attempt in 0...retryDelays.count {
|
||||
do {
|
||||
return try await transcriptionSession.upload(for: request, fromFile: bodyURL)
|
||||
} catch {
|
||||
guard attempt < retryDelays.count, isRetryableTranscriptionError(error) else {
|
||||
throw error
|
||||
}
|
||||
try await Task.sleep(nanoseconds: retryDelays[attempt] * 1_000_000_000)
|
||||
}
|
||||
}
|
||||
throw CoderAPIError.invalidResponse
|
||||
}
|
||||
|
||||
private func isRetryableTranscriptionError(_ error: Error) -> Bool {
|
||||
guard let urlError = error as? URLError else { return false }
|
||||
switch urlError.code {
|
||||
case .networkConnectionLost, .cannotConnectToHost, .timedOut:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
private func makeAudioChunks(from fileURL: URL, preserveSpeakerIdentity: Bool) throws -> [AudioChunk] {
|
||||
let input = try AVAudioFile(forReading: fileURL)
|
||||
let format = input.processingFormat
|
||||
|
||||
@@ -182,13 +182,13 @@ private enum LocalAPIRouter {
|
||||
}
|
||||
|
||||
private enum LocalRecordingError: LocalizedError {
|
||||
case processing
|
||||
case stopping
|
||||
case saveFailed
|
||||
|
||||
var errorDescription: String? {
|
||||
switch self {
|
||||
case .processing:
|
||||
return "The previous meeting is still processing."
|
||||
case .stopping:
|
||||
return "The current recording is still stopping."
|
||||
case .saveFailed:
|
||||
return "Could not create a meeting for this recording."
|
||||
}
|
||||
@@ -208,12 +208,12 @@ private final class LocalRecordingController {
|
||||
|
||||
func statusPayload() -> [String: Any] {
|
||||
let state: String
|
||||
if isStopping || recordingManager.isProcessing {
|
||||
state = "processing"
|
||||
} else if recordingManager.isRecording {
|
||||
if recordingManager.isRecording {
|
||||
state = "recording"
|
||||
} else if recordingManager.activeMeetingId != nil {
|
||||
state = "starting"
|
||||
} else if isStopping || recordingManager.isProcessing {
|
||||
state = "processing"
|
||||
} else {
|
||||
state = "idle"
|
||||
}
|
||||
@@ -245,8 +245,8 @@ private final class LocalRecordingController {
|
||||
isStopping = false
|
||||
return statusPayload()
|
||||
}
|
||||
if isStopping || recordingManager.isProcessing {
|
||||
throw LocalRecordingError.processing
|
||||
if isStopping {
|
||||
throw LocalRecordingError.stopping
|
||||
}
|
||||
if recordingManager.activeMeetingId != nil {
|
||||
return statusPayload()
|
||||
@@ -295,15 +295,16 @@ private final class LocalRecordingController {
|
||||
private func finishRecording() async {
|
||||
pendingStopTask = nil
|
||||
let meetingID = recordingManager.activeMeetingId
|
||||
let chunks = await recordingManager.stopRecording()
|
||||
isStopping = false
|
||||
let completion = await recordingManager.stopRecording()
|
||||
guard let meetingID,
|
||||
var meeting = LocalStorageManager.shared.loadMeetings().first(where: { $0.id == meetingID }) else {
|
||||
isStopping = false
|
||||
return
|
||||
}
|
||||
|
||||
meeting.transcriptChunks = chunks
|
||||
meeting.recoveryAudioFolderName = recordingManager.lastRecoveryAudioFolderName
|
||||
meeting.transcriptChunks = completion.chunks
|
||||
meeting.recoveryAudioFolderName = completion.recoveryAudioFolderName
|
||||
meeting.transcriptionError = completion.transcriptionError
|
||||
let templates = LocalStorageManager.shared.loadTemplates()
|
||||
if meeting.templateId == nil {
|
||||
meeting.templateId = LocalStorageManager.shared.preferredTemplateID(in: templates)
|
||||
@@ -352,7 +353,6 @@ private final class LocalRecordingController {
|
||||
NotificationCenter.default.post(name: .meetingSaved, object: meeting)
|
||||
}
|
||||
}
|
||||
isStopping = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ class MeetingViewModel: ObservableObject {
|
||||
|
||||
var isProcessing: Bool {
|
||||
return isRetryingTranscription ||
|
||||
(recordingSessionManager.isProcessing && recordingSessionManager.activeMeetingId == meeting.id)
|
||||
recordingSessionManager.isProcessingMeeting(meeting.id)
|
||||
}
|
||||
|
||||
var canRetryTranscription: Bool {
|
||||
@@ -137,13 +137,11 @@ class MeetingViewModel: ObservableObject {
|
||||
self.meeting.transcriptChunks = recordingSessionManager.getTranscriptChunks(for: meeting.id)
|
||||
}
|
||||
|
||||
// Listen for final transcript updates for this meeting.
|
||||
// Listen for transcript updates emitted while this meeting is recording.
|
||||
recordingSessionManager.$activeRecordingTranscriptChunksUpdated
|
||||
.dropFirst()
|
||||
.sink { [weak self] updatedChunks in
|
||||
guard let self = self else { return }
|
||||
// Stop publishes the final chunks after capture has ended but
|
||||
// before the active meeting is cleared.
|
||||
if recordingSessionManager.activeMeetingId == self.meeting.id {
|
||||
self.meeting.transcriptChunks = updatedChunks
|
||||
}
|
||||
@@ -223,10 +221,11 @@ class MeetingViewModel: ObservableObject {
|
||||
func stopRecording() {
|
||||
isStartingRecording = true
|
||||
Task {
|
||||
let chunks = await recordingSessionManager.stopRecording()
|
||||
meeting.transcriptChunks = chunks
|
||||
meeting.recoveryAudioFolderName = recordingSessionManager.lastRecoveryAudioFolderName
|
||||
meeting.transcriptionError = recordingSessionManager.errorMessage
|
||||
let completion = await recordingSessionManager.stopRecording()
|
||||
meeting.transcriptChunks = completion.chunks
|
||||
meeting.recoveryAudioFolderName = completion.recoveryAudioFolderName
|
||||
meeting.transcriptionError = completion.transcriptionError
|
||||
errorMessage = completion.transcriptionError
|
||||
refreshRecoveryAudioFolder()
|
||||
saveMeeting()
|
||||
if !meeting.formattedTranscript.isEmpty {
|
||||
|
||||
@@ -255,7 +255,7 @@ struct SettingsView: View {
|
||||
|
||||
// Link to GitHub repository
|
||||
Link("GitHub",
|
||||
destination: URL(string: "https://github.com/superdooper86/meetingnotes")!)
|
||||
destination: URL(string: "https://git.jamesbone.net/coder/meetingnotes")!)
|
||||
.foregroundColor(.blue)
|
||||
|
||||
// Link to landing page
|
||||
|
||||
@@ -14,11 +14,13 @@ APP_PATH="$DERIVED_DATA/Build/Products/Release/$APP_NAME.app"
|
||||
required_variables=(
|
||||
VERSION
|
||||
SIGNING_IDENTITY
|
||||
SIGNING_KEYCHAIN
|
||||
APPLE_ID
|
||||
APPLE_TEAM_ID
|
||||
APPLE_APP_PASSWORD
|
||||
SPARKLE_PRIVATE_KEY
|
||||
GITHUB_REPOSITORY
|
||||
RELEASE_BASE_URL
|
||||
)
|
||||
|
||||
for variable in "${required_variables[@]}"; do
|
||||
@@ -57,12 +59,12 @@ SPARKLE_FRAMEWORK="$APP_PATH/Contents/Frameworks/Sparkle.framework"
|
||||
SPARKLE_CONTENTS="$SPARKLE_FRAMEWORK/Versions/B"
|
||||
|
||||
sign_component() {
|
||||
codesign --force --timestamp --options runtime --sign "$SIGNING_IDENTITY" "$1"
|
||||
codesign --force --timestamp --options runtime --keychain "$SIGNING_KEYCHAIN" --sign "$SIGNING_IDENTITY" "$1"
|
||||
}
|
||||
|
||||
sign_component "$SPARKLE_CONTENTS/XPCServices/Installer.xpc"
|
||||
if [[ -d "$SPARKLE_CONTENTS/XPCServices/Downloader.xpc" ]]; then
|
||||
codesign --force --timestamp --options runtime \
|
||||
codesign --force --timestamp --options runtime --keychain "$SIGNING_KEYCHAIN" \
|
||||
--preserve-metadata=entitlements \
|
||||
--sign "$SIGNING_IDENTITY" \
|
||||
"$SPARKLE_CONTENTS/XPCServices/Downloader.xpc"
|
||||
@@ -71,7 +73,7 @@ sign_component "$SPARKLE_CONTENTS/Autoupdate"
|
||||
sign_component "$SPARKLE_CONTENTS/Updater.app"
|
||||
sign_component "$SPARKLE_FRAMEWORK"
|
||||
|
||||
codesign --force --timestamp --options runtime \
|
||||
codesign --force --timestamp --options runtime --keychain "$SIGNING_KEYCHAIN" \
|
||||
--entitlements meetingnotes/meetingnotes.entitlements \
|
||||
--sign "$SIGNING_IDENTITY" \
|
||||
"$APP_PATH"
|
||||
@@ -116,7 +118,7 @@ if [[ -z "$GENERATE_APPCAST" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DOWNLOAD_URL="https://github.com/$GITHUB_REPOSITORY/releases/download/v$VERSION/"
|
||||
DOWNLOAD_URL="$RELEASE_BASE_URL/releases/download/v$VERSION/"
|
||||
printf '%s' "$SPARKLE_PRIVATE_KEY" | "$GENERATE_APPCAST" "$RELEASE_DIR" \
|
||||
--ed-key-file - \
|
||||
--download-url-prefix "$DOWNLOAD_URL" \
|
||||
@@ -127,7 +129,7 @@ grep -q "$DOWNLOAD_URL$ARCHIVE_NAME" "$RELEASE_DIR/appcast.xml"
|
||||
grep -q 'sparkle:edSignature=' "$RELEASE_DIR/appcast.xml"
|
||||
|
||||
if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
|
||||
printf 'Built, Developer ID-signed, notarized, and stapled Meetingnotes %s. The GitHub release is ready to publish.\n' \
|
||||
printf 'Built, Developer ID-signed, notarized, and stapled Meetingnotes %s. The Gitea release is ready to publish.\n' \
|
||||
"$VERSION" >> "$GITHUB_STEP_SUMMARY"
|
||||
fi
|
||||
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Publish both signed assets together, keeping incomplete uploads as a draft."""
|
||||
import json
|
||||
import os
|
||||
import urllib.error
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
base = os.environ["GITEA_SERVER_URL"].rstrip("/") + "/api/v1/repos/" + os.environ["GITHUB_REPOSITORY"]
|
||||
token = os.environ["GITEA_TOKEN"]
|
||||
version = os.environ["VERSION"]
|
||||
|
||||
|
||||
class NoRedirect(urllib.request.HTTPRedirectHandler):
|
||||
def redirect_request(self, *args, **kwargs):
|
||||
return None
|
||||
|
||||
|
||||
def request(path, method="GET", data=None, binary=False):
|
||||
body = data if binary else None if data is None else json.dumps(data).encode()
|
||||
req = urllib.request.Request(base + path, method=method, data=body, headers={
|
||||
"Authorization": "token " + token,
|
||||
"Content-Type": "application/octet-stream" if binary else "application/json",
|
||||
"User-Agent": "Meetingnotes-release",
|
||||
})
|
||||
with urllib.request.build_opener(NoRedirect()).open(req, timeout=120) as response:
|
||||
raw = response.read()
|
||||
return json.loads(raw) if raw else None
|
||||
|
||||
|
||||
release_dir = Path(os.environ["RUNNER_TEMP"]) / "meetingnotes-release/release"
|
||||
assets = [release_dir / f"Meetingnotes-{version}.zip", release_dir / "appcast.xml"]
|
||||
for asset in assets:
|
||||
if not asset.is_file() or not asset.stat().st_size:
|
||||
raise RuntimeError(f"Missing release artifact: {asset.name}")
|
||||
release = request("/releases", "POST", {
|
||||
"tag_name": "v" + version, "target_commitish": os.environ["GITHUB_SHA"],
|
||||
"name": "Meetingnotes " + version, "draft": True, "prerelease": False,
|
||||
"body": "Developer ID signed, Apple notarized, and signed for Sparkle updates.\n\nBuilt from main at `" + os.environ["GITHUB_SHA"] + "`.",
|
||||
})
|
||||
for asset in assets:
|
||||
request(f"/releases/{release['id']}/assets?name=" + urllib.parse.quote(asset.name), "POST", asset.read_bytes(), binary=True)
|
||||
request(f"/releases/{release['id']}", "PATCH", {"draft": False})
|
||||
print("Published Meetingnotes " + version)
|
||||
@@ -0,0 +1,62 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Check the CI app's unauthenticated API without changing saved preferences."""
|
||||
import json
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
# Launch from the Mac's internal volume; the runner checkout is on removable storage.
|
||||
cache = Path.home() / "Library/Caches/meetingnotes-ci"
|
||||
cache.mkdir(parents=True, exist_ok=True)
|
||||
with tempfile.TemporaryDirectory(prefix="smoke-", dir=cache) as directory:
|
||||
staged = Path(directory) / "Meetingnotes.app"
|
||||
subprocess.run(["ditto", sys.argv[1], str(staged)], check=True)
|
||||
app = staged / "Contents/MacOS/Meetingnotes"
|
||||
with socket.socket() as listener:
|
||||
listener.bind(("127.0.0.1", 0))
|
||||
port = listener.getsockname()[1]
|
||||
with tempfile.TemporaryFile() as log:
|
||||
process = subprocess.Popen(
|
||||
[str(app), "-muteDeckAPIEnabled", "YES", "-muteDeckAPIPort", str(port), "-hasCompletedOnboarding", "YES", "-hasAcceptedTerms", "YES", "-SUEnableAutomaticChecks", "NO"],
|
||||
stdout=log, stderr=subprocess.STDOUT,
|
||||
)
|
||||
try:
|
||||
for attempt in range(30):
|
||||
if process.poll() is not None:
|
||||
raise RuntimeError("CI app exited before the API became ready")
|
||||
try:
|
||||
with urllib.request.urlopen(f"http://127.0.0.1:{port}/api/info", timeout=2) as response:
|
||||
info = json.load(response)
|
||||
break
|
||||
except (urllib.error.URLError, TimeoutError):
|
||||
time.sleep(1)
|
||||
else:
|
||||
raise RuntimeError("CI API did not become ready")
|
||||
assert info["name"] == "MeetingDebrief", "Unexpected API identity"
|
||||
try:
|
||||
urllib.request.urlopen(f"http://127.0.0.1:{port}/api/recording/status", timeout=2)
|
||||
except urllib.error.HTTPError as error:
|
||||
assert error.code == 401, f"Unexpected status: {error.code}"
|
||||
else:
|
||||
raise RuntimeError("Recording status allowed an unauthenticated request")
|
||||
print("Local API readiness and authentication checks passed")
|
||||
except Exception:
|
||||
if process.poll() is None:
|
||||
sample = subprocess.run(["sample", str(process.pid), "1", "1"], capture_output=True, text=True, timeout=10)
|
||||
print(sample.stdout[:14000], file=sys.stderr)
|
||||
log.seek(0)
|
||||
print(log.read().decode(errors="replace")[-8000:], file=sys.stderr)
|
||||
raise
|
||||
finally:
|
||||
if process.poll() is None:
|
||||
process.terminate()
|
||||
try:
|
||||
process.wait(timeout=10)
|
||||
except subprocess.TimeoutExpired:
|
||||
process.kill()
|
||||
process.wait()
|
||||
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Import the CI certificate into an isolated keychain for one release command."""
|
||||
import base64
|
||||
import os
|
||||
import re
|
||||
import secrets
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def security(*args):
|
||||
result = subprocess.run(["security", *args], capture_output=True, text=True)
|
||||
if result.returncode:
|
||||
raise RuntimeError(f"security {args[0]} failed (output withheld to protect credentials)")
|
||||
return result.stdout
|
||||
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix="meetingnotes-signing-", dir=os.environ["RUNNER_TEMP"]) as directory:
|
||||
keychain = str(Path(directory) / "release.keychain-db")
|
||||
certificate = Path(directory) / "certificate.p12"
|
||||
certificate.write_bytes(base64.b64decode(os.environ["APPLE_CERTIFICATE_P12"]))
|
||||
certificate.chmod(0o600)
|
||||
password = secrets.token_urlsafe(32)
|
||||
created = False
|
||||
try:
|
||||
security("create-keychain", "-p", password, keychain)
|
||||
created = True
|
||||
security("set-keychain-settings", "-lut", "21600", keychain)
|
||||
security("unlock-keychain", "-p", password, keychain)
|
||||
security("import", str(certificate), "-k", keychain, "-P", os.environ["APPLE_CERTIFICATE_PASSWORD"], "-T", "/usr/bin/codesign", "-T", "/usr/bin/security")
|
||||
security("set-key-partition-list", "-S", "apple-tool:,apple:", "-s", "-k", password, keychain)
|
||||
identities = security("find-identity", "-v", "-p", "codesigning", keychain)
|
||||
match = re.search(r'([0-9A-F]{40}) "Developer ID Application:', identities)
|
||||
if not match:
|
||||
raise RuntimeError("The certificate contains no valid Developer ID Application identity")
|
||||
environment = dict(os.environ, SIGNING_IDENTITY=match[1], SIGNING_KEYCHAIN=keychain)
|
||||
status = subprocess.run(sys.argv[1:], env=environment).returncode
|
||||
finally:
|
||||
if created:
|
||||
security("delete-keychain", keychain)
|
||||
sys.exit(status)
|
||||
Reference in New Issue
Block a user