craft-native 0.0.497 → 0.0.500

package/dist/ios/templates/CraftPersistentStorage.swift

@@ -13,11 +13,22 @@ enum CraftPersistentStorage {
         let digest = SHA256.hash(data: Data(key.utf8)).map { String(format: "%02x", $0) }.joined()
         return directory.appendingPathComponent(digest + ".json")
     }
+    /// What an entry file holds, or nil when it is there and is not an entry.
+    ///
+    /// A file that cannot be parsed is a corrupt value, as one that parses to
+    /// the wrong thing is, and an app starts that value again. Only a file
+    /// that cannot be read at all is the disk failing, which an app retries;
+    /// that still throws. The two used to share the disk's answer.
+    private static func entry(at source: URL) throws -> [String: Any]? {
+        let contents = try Data(contentsOf: source)
+        return (try? JSONSerialization.jsonObject(with: contents)) as? [String: Any]
+    }
+
     static func get(_ key: String, prefix: String, storageDirectory: URL? = nil) throws -> Data? {
         lock.lock(); defer { lock.unlock() }
         let source = path(key, directory: storageDirectory ?? directory)
         if FileManager.default.fileExists(atPath: source.path) {
-            guard let saved = try JSONSerialization.jsonObject(with: Data(contentsOf: source)) as? [String: Any], saved["key"] as? String == key else {
+            guard let saved = try entry(at: source), saved["key"] as? String == key else {
                 throw CraftNativeActionError(code: "STORAGE_CORRUPT", message: "Invalid stored value")
             }
             if saved["deleted"] as? Bool == true { return nil }
@@ -26,7 +37,9 @@ enum CraftPersistentStorage {
         }
         guard let legacy = UserDefaults.standard.data(forKey: prefix + key) else { return nil }
         // Only valid legacy JSON qualifies for deferred migration on I/O failure.
-        _ = try JSONSerialization.jsonObject(with: legacy, options: .fragmentsAllowed)
+        guard (try? JSONSerialization.jsonObject(with: legacy, options: .fragmentsAllowed)) != nil else {
+            throw CraftNativeActionError(code: "STORAGE_CORRUPT", message: "Stored value is not valid JSON")
+        }
         // Reading a valid legacy checkpoint must survive a full disk. Migration
         // can be retried on a later read; only a successful set promises a new
         // durable checkpoint and permits the application to acknowledge it.
@@ -84,9 +97,11 @@ enum CraftPersistentStorage {
         var result = Set(UserDefaults.standard.dictionaryRepresentation().keys.filter { $0.hasPrefix(prefix) }.map { String($0.dropFirst(prefix.count)) })
         if FileManager.default.fileExists(atPath: directory.path) {
             for source in try FileManager.default.contentsOfDirectory(at: directory, includingPropertiesForKeys: nil) where source.pathExtension == "json" {
-                guard let entry = try JSONSerialization.jsonObject(with: Data(contentsOf: source)) as? [String: Any], let key = entry["key"] as? String else {
-                    throw CraftNativeActionError(code: "STORAGE_CORRUPT", message: "Invalid stored value")
-                }
+                // A file that is not an entry names no key. It used to fail
+                // the whole listing, and `clear` with it, over a value
+                // neither call had been asked about. `get` of its key still
+                // answers STORAGE_CORRUPT.
+                guard let entry = try entry(at: source), let key = entry["key"] as? String else { continue }
                 if entry["deleted"] as? Bool == true { result.remove(key) } else { result.insert(key) }
             }
         }
@@ -95,5 +110,13 @@ enum CraftPersistentStorage {
     static func clear(prefix: String) throws {
         lock.lock(); defer { lock.unlock() }
         for key in try keys(prefix: prefix) { try set(key, data: nil, prefix: prefix) }
+        // Clearing a key writes over its file, so what is still not an entry
+        // belongs to no key this store knows, and cannot be marked removed.
+        // It is deleted. No earlier value can come back in its place: every
+        // one this store mirrors was removed just above.
+        guard FileManager.default.fileExists(atPath: directory.path) else { return }
+        for source in try FileManager.default.contentsOfDirectory(at: directory, includingPropertiesForKeys: nil) where source.pathExtension == "json" {
+            if try entry(at: source)?["key"] as? String == nil { try FileManager.default.removeItem(at: source) }
+        }
     }
 }

package/dist/ios/templates/CraftScheduledWorkouts.swift

@@ -317,6 +317,13 @@ enum CraftWorkoutPlanBuilder {
         return double.isFinite ? double : nil
     }
 
+    /// A number as a whole one, toward zero, or nil when no `Int` holds it.
+    /// `Int(_:)` traps there, and these come from the caller: an `hour` of
+    /// `1e30` ended the process where it should have been refused (#510).
+    private static func whole(_ value: Any?) -> Int? {
+        number(value).flatMap { Int(exactly: $0.rounded(.towardZero)) }
+    }
+
     /// Two schedule dates as WorkoutKit compares them: the day and the time of day.
     static func sameMoment(_ a: DateComponents, _ b: DateComponents) -> Bool {
         a.year == b.year && a.month == b.month && a.day == b.day && (a.hour ?? 0) == (b.hour ?? 0) && (a.minute ?? 0) == (b.minute ?? 0)
@@ -328,8 +335,8 @@ enum CraftWorkoutPlanBuilder {
         let parts = text.split(separator: "-", omittingEmptySubsequences: false)
         guard parts.count == 3, parts[0].count == 4, parts[1].count == 2, parts[2].count == 2,
               let year = Int(parts[0]), let month = Int(parts[1]), let day = Int(parts[2]) else { return nil }
-        let hour = body["hour"] == nil || body["hour"] is NSNull ? 7 : number(body["hour"]).map { Int($0) }
-        let minute = body["minute"] == nil || body["minute"] is NSNull ? 0 : number(body["minute"]).map { Int($0) }
+        let hour = body["hour"] == nil || body["hour"] is NSNull ? 7 : whole(body["hour"])
+        let minute = body["minute"] == nil || body["minute"] is NSNull ? 0 : whole(body["minute"])
         guard let hour, let minute, (0...23).contains(hour), (0...59).contains(minute) else { return nil }
         var components = DateComponents()
         components.year = year
@@ -379,7 +386,7 @@ enum CraftWorkoutPlanBuilder {
         }
         func zone() -> Int? {
             guard let value = number(body["zone"]), value >= 1, value.rounded() == value else { return nil }
-            return Int(value)
+            return Int(exactly: value)
         }
         switch type {
         case "heartRate":
@@ -485,7 +492,7 @@ enum CraftWorkoutPlanBuilder {
         var blocks: [IntervalBlock] = []
         for (blockIndex, value) in (workout["blocks"] as? [Any] ?? []).enumerated() {
             let block = value as? [String: Any] ?? [:]
-            let iterations = number(block["iterations"] ?? 1).map { Int($0) } ?? 0
+            let iterations = whole(block["iterations"] ?? 1) ?? 0
             guard iterations >= 1 else { return refuse("block \(blockIndex + 1) needs iterations of 1 or more") }
             var steps: [IntervalStep] = []
             for (stepIndex, entry) in (block["steps"] as? [Any] ?? []).enumerated() {

package/dist/ios/templates/CraftWebAudio.swift

@@ -503,6 +503,25 @@ final class CraftAudioBufferSource: CraftAudioSource {
     private var played = 0.0
     private var began = false
 
+    /// An arbitrary limit on the rate, and WebKit's: `MaxRate` in its
+    /// AudioBufferSourceNode.
+    static let maximumRate = 1024.0
+
+    /// The rate a buffer plays at: its own sample rate over the context's,
+    /// times `playbackRate`, times two to the power of `detune` in octaves.
+    ///
+    /// Neither param is bounded for a buffer source, so the product can be
+    /// infinite (a detune of 2,000,000 cents) or not a number (that, with a
+    /// playbackRate of 0). A looping source wrapped an infinite position into
+    /// one that is not a number, and `Int(position)` traps on it: the render
+    /// thread ended the process. WebKit clamps the rate to its limit either
+    /// side of zero and plays a rate that is not a number at 1; so does this.
+    static func rate(ratio: Double, playbackRate: Double, detune: Double) -> Double {
+        let rate = ratio * playbackRate * pow(2, detune / 1200)
+        guard !rate.isNaN else { return 1 }
+        return max(-maximumRate, min(maximumRate, rate))
+    }
+
     override init(id: Int) {
         super.init(id: id)
         params = [playbackRate, detune]
@@ -530,7 +549,7 @@ final class CraftAudioBufferSource: CraftAudioSource {
                 position = loopFrom + (position - loopFrom).truncatingRemainder(dividingBy: span)
             }
         }
-        let rate = buffer.sampleRate / render.sampleRate * Double(playbackRate.values[0]) * pow(2, Double(detune.values[0]) / 1200)
+        let rate = Self.rate(ratio: buffer.sampleRate / render.sampleRate, playbackRate: Double(playbackRate.values[0]), detune: Double(detune.values[0]))
         let first = buffer.channels[0]
         let second = buffer.channels.count > 1 ? buffer.channels[1] : first
         let frames = buffer.length

package/dist/package.d.ts

@@ -376,6 +376,28 @@ export declare function windowsExecutableName(name: string): string;
  * off, so nothing ever reported it.
  */
 export declare function candleArguments(architecture: 'x86' | 'x64' | 'arm64', wixobjPath: string, wxsPath: string): string[];
+/**
+ * Helper: Create Linux RPM package
+ */
+/**
+ * The spec an app's rpm is built from: one prebuilt executable, installed as
+ * it is.
+ *
+ * `Source0` names the executable, which is what `%{SOURCE0}` in `%install`
+ * refers to; without the tag the macro is not defined and the install step
+ * fails. The executable is a finished program, so nothing is stripped from it,
+ * no debug package is split off and no build-id links are made: a compiled
+ * app that carries its own data after the program (a Bun or Deno executable)
+ * stops working when strip rewrites it. With nothing required, the `Requires`
+ * line is left out, because an empty one is not valid.
+ */
+export declare function rpmSpec(options: {
+    name: string;
+    version: string;
+    summary: string;
+    description: string;
+    requires?: string;
+}): string;
 /**
  * Simple packaging function for quick use
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.497",
+  "version": "0.0.500",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",