@hasna/recordings 0.1.34 → 0.1.36

package/dist/storage.js

@@ -2940,7 +2940,7 @@ var require_dist = __commonJS((exports) => {
   function parse(stream, callback) {
     const parser = new parser_1.Parser;
     stream.on("data", (buffer) => parser.parse(buffer, callback));
-    return new Promise((resolve) => stream.on("end", () => resolve()));
+    return new Promise((resolve2) => stream.on("end", () => resolve2()));
   }
   exports.parse = parse;
 });
@@ -3619,12 +3619,12 @@ var require_client = __commonJS((exports, module) => {
         this._connect(callback);
         return;
       }
-      return new this._Promise((resolve, reject) => {
+      return new this._Promise((resolve2, reject) => {
         this._connect((error) => {
           if (error) {
             reject(error);
           } else {
-            resolve(this);
+            resolve2(this);
           }
         });
       });
@@ -3956,8 +3956,8 @@ var require_client = __commonJS((exports, module) => {
         readTimeout = config.query_timeout || this.connectionParameters.query_timeout;
         query = new Query(config, values, callback);
         if (!query.callback) {
-          result = new this._Promise((resolve, reject) => {
-            query.callback = (err, res) => err ? reject(err) : resolve(res);
+          result = new this._Promise((resolve2, reject) => {
+            query.callback = (err, res) => err ? reject(err) : resolve2(res);
           }).catch((err) => {
             Error.captureStackTrace(err);
             throw err;
@@ -4032,8 +4032,8 @@ var require_client = __commonJS((exports, module) => {
       if (cb) {
         this.connection.once("end", cb);
       } else {
-        return new this._Promise((resolve) => {
-          this.connection.once("end", resolve);
+        return new this._Promise((resolve2) => {
+          this.connection.once("end", resolve2);
         });
       }
     }
@@ -4080,8 +4080,8 @@ var require_pg_pool = __commonJS((exports, module) => {
     const cb = function(err, client) {
       err ? rej(err) : res(client);
     };
-    const result = new Promise2(function(resolve, reject) {
-      res = resolve;
+    const result = new Promise2(function(resolve2, reject) {
+      res = resolve2;
       rej = reject;
     }).catch((err) => {
       Error.captureStackTrace(err);
@@ -4142,7 +4142,7 @@ var require_pg_pool = __commonJS((exports, module) => {
       if (typeof Promise2.try === "function") {
         return Promise2.try(f);
       }
-      return new Promise2((resolve) => resolve(f()));
+      return new Promise2((resolve2) => resolve2(f()));
     }
     _isFull() {
       return this._clients.length >= this.options.max;
@@ -4518,8 +4518,8 @@ var require_query2 = __commonJS((exports, module) => {
   NativeQuery.prototype._getPromise = function() {
     if (this._promise)
       return this._promise;
-    this._promise = new Promise(function(resolve, reject) {
-      this._once("end", resolve);
+    this._promise = new Promise(function(resolve2, reject) {
+      this._once("end", resolve2);
       this._once("error", reject);
     }.bind(this));
     return this._promise;
@@ -4693,12 +4693,12 @@ var require_client2 = __commonJS((exports, module) => {
       this._connect(callback);
       return;
     }
-    return new this._Promise((resolve, reject) => {
+    return new this._Promise((resolve2, reject) => {
       this._connect((error) => {
         if (error) {
           reject(error);
         } else {
-          resolve(this);
+          resolve2(this);
         }
       });
     });
@@ -4722,8 +4722,8 @@ var require_client2 = __commonJS((exports, module) => {
       query = new NativeQuery(config, values, callback);
       if (!query.callback) {
         let resolveOut, rejectOut;
-        result = new this._Promise((resolve, reject) => {
-          resolveOut = resolve;
+        result = new this._Promise((resolve2, reject) => {
+          resolveOut = resolve2;
           rejectOut = reject;
         }).catch((err) => {
           Error.captureStackTrace(err);
@@ -4781,8 +4781,8 @@ var require_client2 = __commonJS((exports, module) => {
     }
     let result;
     if (!cb) {
-      result = new this._Promise(function(resolve, reject) {
-        cb = (err) => err ? reject(err) : resolve();
+      result = new this._Promise(function(resolve2, reject) {
+        cb = (err) => err ? reject(err) : resolve2();
       });
     }
     this.native.end(function() {
@@ -4906,11 +4906,12 @@ var require_lib2 = __commonJS((exports, module) => {
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-var STORAGE_CONFIG_PATH = join(homedir(), ".hasna", "recordings", "storage", "config.json");
+var LEGACY_DATABASE_CONFIG_KEY = ["r", "d", "s"].join("");
 var RECORDINGS_STORAGE_ENV = "HASNA_RECORDINGS_DATABASE_URL";
 var RECORDINGS_STORAGE_FALLBACK_ENV = "RECORDINGS_DATABASE_URL";
 var RECORDINGS_STORAGE_MODE_ENV = "HASNA_RECORDINGS_STORAGE_MODE";
 var RECORDINGS_STORAGE_MODE_FALLBACK_ENV = "RECORDINGS_STORAGE_MODE";
+var RECORDINGS_STORAGE_CONFIG_ENV = "HASNA_RECORDINGS_STORAGE_CONFIG";
 var STORAGE_DATABASE_ENV = [RECORDINGS_STORAGE_ENV, RECORDINGS_STORAGE_FALLBACK_ENV];
 var STORAGE_MODE_ENV = [RECORDINGS_STORAGE_MODE_ENV, RECORDINGS_STORAGE_MODE_FALLBACK_ENV];
 function readEnv(name) {
@@ -4938,10 +4939,16 @@ function getStorageDatabaseUrl() {
   const env = getStorageDatabaseEnv();
   return env ? readEnv(env.name) : undefined;
 }
+function getStorageConfigPath() {
+  const override = readEnv(RECORDINGS_STORAGE_CONFIG_ENV);
+  if (override)
+    return override;
+  return join(homedir(), ".hasna", "recordings", "storage", "config.json");
+}
 function getStorageConfig() {
   const config = {
     mode: "local",
-    rds: {
+    postgres: {
       host: "",
       port: 5432,
       username: "",
@@ -4949,11 +4956,13 @@ function getStorageConfig() {
       ssl: true
     }
   };
-  if (existsSync(STORAGE_CONFIG_PATH)) {
+  const storageConfigPath = getStorageConfigPath();
+  if (existsSync(storageConfigPath)) {
     try {
-      const raw = JSON.parse(readFileSync(STORAGE_CONFIG_PATH, "utf-8"));
+      const raw = JSON.parse(readFileSync(storageConfigPath, "utf-8"));
+      const legacyDatabaseConfig = typeof raw[LEGACY_DATABASE_CONFIG_KEY] === "object" && raw[LEGACY_DATABASE_CONFIG_KEY] !== null ? raw[LEGACY_DATABASE_CONFIG_KEY] : {};
       config.mode = normalizeMode(raw.mode) ?? config.mode;
-      config.rds = { ...config.rds, ...raw.rds ?? {} };
+      config.postgres = { ...config.postgres, ...legacyDatabaseConfig, ...raw.postgres ?? {} };
     } catch {}
   }
   const modeOverride = readEnv(RECORDINGS_STORAGE_MODE_ENV) ?? readEnv(RECORDINGS_STORAGE_MODE_FALLBACK_ENV);
@@ -4970,7 +4979,7 @@ function getStorageConnectionString(dbName = "recordings") {
   if (direct)
     return direct;
   const config = getStorageConfig();
-  const { host, port, username, password_env, ssl } = config.rds;
+  const { host, port, username, password_env, ssl } = config.postgres;
   if (!host || !username) {
     throw new Error("Storage database is not configured. Set HASNA_RECORDINGS_DATABASE_URL or configure ~/.hasna/recordings/storage/config.json.");
   }
@@ -5015,11 +5024,11 @@ class SqliteAdapter {
 
 // src/db/database.ts
 import { mkdirSync as mkdirSync2 } from "fs";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 
 // src/lib/config.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, mkdirSync, cpSync, readdirSync, statSync } from "fs";
-import { join as join2 } from "path";
+import { copyFileSync, existsSync as existsSync2, readFileSync as readFileSync2, mkdirSync, readdirSync, statSync } from "fs";
+import { dirname, join as join2, resolve } from "path";
 import { homedir as homedir2 } from "os";
 var DEFAULT_CONFIG = {
   openai_api_key: "",
@@ -5113,44 +5122,53 @@ function expandEnvBackedConfig(config) {
   return expanded;
 }
 function findConfigFile() {
-  let dir = process.cwd();
-  const root = "/";
-  while (dir !== root) {
-    const candidate = join2(dir, ".recordings", "config.json");
-    if (existsSync2(candidate))
-      return candidate;
-    const parent = join2(dir, "..");
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  return null;
+  return findProjectRecordingsPath("config.json");
 }
 function getDataDir() {
-  let dir = process.cwd();
-  const root = "/";
-  while (dir !== root) {
-    const candidate = join2(dir, ".recordings");
-    if (existsSync2(candidate))
-      return candidate;
-    const parent = join2(dir, "..");
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  const home = homedir2();
+  const projectLocalDir = findProjectRecordingsPath();
+  if (projectLocalDir)
+    return projectLocalDir;
+  const home = getHomeDir();
   const newDir = join2(home, ".hasna", "recordings");
   const oldDir = join2(home, ".recordings");
-  if (!existsSync2(newDir) && existsSync2(oldDir)) {
+  if (existsSync2(oldDir)) {
     try {
-      mkdirSync(join2(home, ".hasna"), { recursive: true });
-      cpSync(oldDir, newDir, { recursive: true });
+      mergeDirectoryContents(oldDir, newDir);
     } catch {}
   }
   return newDir;
 }
+function findProjectRecordingsPath(entry) {
+  const home = resolve(getHomeDir());
+  let dir = resolve(process.cwd());
+  while (true) {
+    if (dir !== home) {
+      const candidate = entry ? join2(dir, ".recordings", entry) : join2(dir, ".recordings");
+      if (existsSync2(candidate))
+        return candidate;
+    }
+    const parent = dirname(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  return null;
+}
+function mergeDirectoryContents(sourceDir, targetDir) {
+  mkdirSync(targetDir, { recursive: true });
+  for (const entry of readdirSync(sourceDir)) {
+    const sourcePath = join2(sourceDir, entry);
+    const targetPath = join2(targetDir, entry);
+    const sourceStats = statSync(sourcePath);
+    if (sourceStats.isDirectory()) {
+      mergeDirectoryContents(sourcePath, targetPath);
+    } else if (!existsSync2(targetPath)) {
+      copyFileSync(sourcePath, targetPath);
+    }
+  }
+}
 function loadSecretKey(keyName) {
-  const secretsPath = join2(homedir2(), ".secrets");
+  const secretsPath = join2(getHomeDir(), ".secrets");
   if (!existsSync2(secretsPath))
     return "";
   for (const candidate of listSecretFiles(secretsPath)) {
@@ -5191,6 +5209,9 @@ function listSecretFiles(path) {
     return [];
   }
 }
+function getHomeDir() {
+  return process.env["HOME"] || process.env["USERPROFILE"] || homedir2();
+}
 function ensureDataDir(config) {
   const { mkdirSync: mkdirSync2 } = __require("fs");
   mkdirSync2(config.audio_dir, { recursive: true });
@@ -5285,7 +5306,7 @@ function getDatabase(dbPath) {
   if (_db)
     return _db;
   const path = dbPath || loadConfig().db_path;
-  const dir = dirname(path);
+  const dir = dirname2(path);
   mkdirSync2(dir, { recursive: true });
   _adapter = new SqliteAdapter(path);
   _db = _adapter.raw;
@@ -5549,8 +5570,9 @@ async function runStorageMigrations(remote) {
 function getStorageStatus(db = getDatabase()) {
   const config = getStorageConfig();
   const activeEnv = getStorageDatabaseEnv();
+  const hasConfiguredPostgres = Boolean(config.postgres.host && config.postgres.username);
   return {
-    configured: Boolean(activeEnv),
+    configured: Boolean(activeEnv) || hasConfiguredPostgres,
     mode: config.mode,
     enabled: config.mode === "hybrid" || config.mode === "remote",
     env: STORAGE_DATABASE_ENV,

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.33";
+export declare const VERSION = "0.1.36";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/recordings",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "type": "module",
   "description": "Speech-to-text recording tool with MCP and CLI — records, transcribes, and optionally enhances text using AI",
   "repository": {
@@ -34,7 +34,9 @@
     "test:coverage": "bun test --coverage",
     "dev:cli": "bun run src/cli/index.ts",
     "dev:mcp": "bun run src/mcp/index.ts",
-    "prepack": "bun run build",
+    "verify:release": "bun run scripts/release-guard.ts",
+    "prepack": "bun run build && bun run verify:release",
+    "prepublishOnly": "bun run typecheck && bun run test",
     "postinstall": "bash scripts/install_macos_app.sh --postinstall"
   },
   "files": [
@@ -50,7 +52,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@hasna/events": "^0.1.7",
+    "@hasna/events": "^0.1.11",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",

package/scripts/install_macos_app.sh

@@ -35,12 +35,12 @@ NATIVE_DIR="${PACKAGE_ROOT}/src/native/Recordings"
 APP_SOURCE="${NATIVE_DIR}/.build/${MODE}/Recordings.app"
 APP_DEST="${DATA_DIR}/Recordings.app"
 
-mkdir -p "${DATA_DIR}/audio"
-
 if [ "$(uname -s)" != "Darwin" ]; then
   exit 0
 fi
 
+mkdir -p "${DATA_DIR}/audio"
+
 warn_or_fail() {
   local message="$1"
   if [ "$POSTINSTALL" -eq 1 ]; then

package/scripts/release-guard.ts

@@ -0,0 +1,129 @@
+#!/usr/bin/env bun
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { join, relative } from "node:path";
+
+type Finding = {
+  file: string;
+  marker: string;
+  kind: "retired-cloud" | "secret-pattern";
+};
+
+type PatternCheck = {
+  label: string;
+  pattern: RegExp;
+};
+
+const repoRoot = process.cwd();
+
+const roots = [
+  "package.json",
+  "README.md",
+  "scripts",
+  "src/storage.ts",
+  "src/index.ts",
+  "src/cli",
+  "src/db",
+  "src/lib",
+  "src/mcp",
+  "src/types",
+  "src/native/Recordings/App",
+  "src/native/Recordings/RecordingsLib",
+  "src/native/Recordings/RecordingsTests",
+  "src/native/Recordings/Package.swift",
+  "src/native/Recordings/Package.resolved",
+  "src/native/Recordings/build.sh",
+  "dist",
+];
+
+const ignoredDirs = new Set([".git", "node_modules", ".build"]);
+
+const retiredCloudMarkers = [
+  ["@hasna", "cloud"].join("/"),
+  ["open", "cloud"].join("-"),
+  ["cloud", "mcp"].join("-"),
+  "register" + "CloudTools",
+  "register" + "CloudCommands",
+  ["HASNA", "CLOUD"].join("_"),
+  ["OPEN", "CLOUD"].join("_"),
+  [".hasna", "cloud"].join("/"),
+  "--" + "cloud",
+  ["cloud", "setup"].join(" "),
+  ["cloud", "sync"].join(" "),
+  ["Cloud", "Sync"].join(" "),
+  ["HASNA", ["R", "D", "S"].join(""), "PASSWORD"].join("_"),
+];
+
+const secretPatterns: PatternCheck[] = [
+  { label: ["sk", "ant", ""].join("-"), pattern: new RegExp(["sk", "ant", ""].join("-")) },
+  { label: ["sk", "proj", ""].join("-"), pattern: new RegExp(["sk", "proj", ""].join("-")) },
+  { label: ["npm", ""].join("_"), pattern: new RegExp(["npm", ""].join("_") + "[A-Za-z]") },
+  { label: ["gho", ""].join("_"), pattern: new RegExp(["gho", ""].join("_")) },
+  { label: ["ghp", ""].join("_"), pattern: new RegExp(["ghp", ""].join("_")) },
+  { label: ["secret", "token"].join("-") + ":", pattern: new RegExp(["secret", "token"].join("-") + ":") },
+  { label: "ctx7sk" + "-", pattern: new RegExp("ctx7sk" + "-") },
+  { label: ["xai", ""].join("-"), pattern: new RegExp(["xai", ""].join("-")) },
+  { label: "AI" + "za" + "[A-Za-z0-9]", pattern: new RegExp("AI" + "za" + "[A-Za-z0-9]") },
+  { label: "AK" + "IA" + "[A-Z0-9]", pattern: new RegExp("AK" + "IA" + "[A-Z0-9]") },
+];
+
+const legacyDatabasePatterns: PatternCheck[] = [
+  {
+    label: ["legacy", "database", ["r", "d", "s"].join("-")].join("-"),
+    pattern: new RegExp("\\b" + ["r", "d", "s"].join("") + "\\b", "i"),
+  },
+];
+
+function isText(buffer: Buffer): boolean {
+  return !buffer.includes(0);
+}
+
+function collectFiles(path: string): string[] {
+  if (!existsSync(path)) return [];
+  const stat = statSync(path);
+  if (stat.isFile()) return [path];
+  if (!stat.isDirectory()) return [];
+
+  const files: string[] = [];
+  for (const entry of readdirSync(path, { withFileTypes: true })) {
+    if (entry.isDirectory() && ignoredDirs.has(entry.name)) continue;
+    files.push(...collectFiles(join(path, entry.name)));
+  }
+  return files;
+}
+
+const findings: Finding[] = [];
+for (const file of roots.flatMap((root) => collectFiles(join(repoRoot, root)))) {
+  const buffer = readFileSync(file);
+  if (!isText(buffer)) continue;
+
+  const content = buffer.toString("utf8");
+  const relativeFile = relative(repoRoot, file);
+
+  for (const marker of retiredCloudMarkers) {
+    if (content.includes(marker)) {
+      findings.push({ file: relativeFile, marker, kind: "retired-cloud" });
+    }
+  }
+
+  for (const check of legacyDatabasePatterns) {
+    if (check.pattern.test(content)) {
+      findings.push({ file: relativeFile, marker: check.label, kind: "retired-cloud" });
+    }
+  }
+
+  for (const check of secretPatterns) {
+    if (check.pattern.test(content)) {
+      findings.push({ file: relativeFile, marker: check.label, kind: "secret-pattern" });
+    }
+  }
+}
+
+if (findings.length > 0) {
+  console.error("Release guard failed:");
+  for (const finding of findings) {
+    console.error(`  ${finding.kind}: ${finding.file}: ${finding.marker}`);
+  }
+  process.exit(1);
+}
+
+console.log("Release guard passed: package-visible files are free of retired cloud and secret markers.");

package/src/native/Recordings/RecordingsTests/CLIRunnerTests.swift

@@ -19,7 +19,7 @@ struct CLIRunnerTests {
 
     @Test("parseError maps invalid API key (401) to a friendly message")
     func invalidKeyError() {
-        let input = "ERROR: Transcription failed: 401 Incorrect API key provided: sk-proj-****vosA. You can find your API key at https://platform.openai.com."
+        let input = "ERROR: Transcription failed: 401 Incorrect API key provided: " + "sk" + "-proj-" + "****vosA. You can find your API key at https://platform.openai.com."
         #expect(CLIRunner.parseError(input) == "OpenAI API key invalid or expired — update it in Recordings Settings")
     }