@akanjs/cli 3.0.0-beta.9 → 3.0.0

package/{index-kcxmv48c.js → index-2ahj896a.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-52w0fvh8.js";
 
 // pkgs/@akanjs/devkit/dependencyScanner.ts
 import { builtinModules } from "module";
@@ -10,7 +10,10 @@ import ignore from "ignore";
 import ts from "typescript";
 var testFileRegex = /\.(?:test|spec)\.[cm]?[tj]sx?$/;
 var skipDirs = ["node_modules", "dist", "build", ".git", ".next", "public", "ios", "android", "__fixtures__"];
-var isSkippedPath = (filePath) => skipDirs.some((dir) => filePath.includes(`/${dir}/`) || filePath.startsWith(`${dir}/`));
+var isSkippedPath = (filePath) => {
+  const posixPath = filePath.split(path.sep).join("/");
+  return skipDirs.some((dir) => posixPath.includes(`/${dir}/`) || posixPath.startsWith(`${dir}/`));
+};
 var builtinModuleSet = new Set([...builtinModules, ...builtinModules.map((mod) => `node:${mod}`)]);
 var stripShebang = (source) => source.replace(/^#!.*(?:\r?\n|$)/, "");
 
@@ -54,24 +57,21 @@ class TypeScriptDependencyScanner2 {
   async getPackageBuildDependencies(projectName) {
     const runtimeDeps = new Set;
     const devDeps = new Set;
-    const sourceFiles = await this.#findTypeScriptFiles(this.#directory, {
-      excludeBuildFiles: true,
-      excludeTestFiles: true
-    });
-    const cssFiles = await this.#findCssFiles(this.#directory);
+    const sourceFiles = await this.#findFiles("**/*.{ts,tsx}", { excludeBuildFiles: true, excludeTestFiles: true });
+    const cssFiles = await this.#findFiles("**/*.css");
     for (const filePath of sourceFiles) {
-      const fileContent = await FileSys.readText(filePath);
+      const fileContent = await FileSys2.readText(filePath);
       const { imports, typeImports } = this.#extractImports(fileContent, filePath);
       this.#addNormalizedImports(runtimeDeps, imports, projectName);
       this.#addNormalizedImports(devDeps, typeImports, projectName);
     }
     for (const filePath of cssFiles) {
-      const fileContent = await FileSys.readText(filePath);
+      const fileContent = await FileSys2.readText(filePath);
       this.#addNormalizedImports(runtimeDeps, this.#extractCssPluginImports(fileContent), projectName);
     }
     const buildFilePath = path.join(this.#directory, "build.ts");
-    if (await FileSys.fileExists(buildFilePath)) {
-      const fileContent = await FileSys.readText(buildFilePath);
+    if (await FileSys2.fileExists(buildFilePath)) {
+      const fileContent = await FileSys2.readText(buildFilePath);
       const { imports, typeImports } = this.#extractImports(fileContent, buildFilePath);
       this.#addNormalizedImports(devDeps, [...imports, ...typeImports], projectName);
     }
@@ -95,7 +95,7 @@ class TypeScriptDependencyScanner2 {
     if (!await Bun.file(packageJsonPath).exists())
       return false;
     try {
-      const packageJson = await FileSys.readJson(packageJsonPath);
+      const packageJson = await FileSys2.readJson(packageJsonPath);
       return packageJson.name === dep && !!packageJson.version;
     } catch {
       return false;
@@ -106,27 +106,21 @@ class TypeScriptDependencyScanner2 {
     return this.#getImportSetsFromDependencies(depSets, fileDependencies);
   }
   #getImportSetsFromDependencies(depSets, fileDependencies) {
-    const importedDepSets = new Array(depSets.length);
-    for (let i = 0;i < depSets.length; i++)
-      importedDepSets[i] = new Set;
-    fileDependencies.forEach((imps) => {
-      imps.forEach((imp) => {
+    const importedDepSets = depSets.map(() => new Set);
+    for (const imps of fileDependencies.values())
+      for (const imp of imps) {
         if (imp.startsWith("."))
-          return;
-        const moduleName = imp;
-        const moduleNameParts = moduleName.split("/");
-        const subModuleLength = moduleNameParts.length;
-        for (let i = 0;i < subModuleLength; i++) {
-          const importName = moduleNameParts.slice(0, i + 1).join("/");
-          for (let j = 0;j < depSets.length; j++) {
-            if (depSets[j]?.has(importName)) {
-              importedDepSets[j]?.add(importName);
-              return;
-            }
-          }
+          continue;
+        const parts = imp.split("/");
+        for (let length = 1;length <= parts.length; length++) {
+          const importName = parts.slice(0, length).join("/");
+          const setIndex = depSets.findIndex((depSet) => depSet.has(importName));
+          if (setIndex === -1)
+            continue;
+          importedDepSets[setIndex]?.add(importName);
+          break;
         }
-      });
-    });
+      }
     return importedDepSets;
   }
   async getDependencies() {
@@ -134,43 +128,25 @@ class TypeScriptDependencyScanner2 {
     this.#fileRuntimeDependencies.clear();
     this.#fileTypeDependencies.clear();
     this.#visitedFiles.clear();
-    const files = await this.#findTypeScriptFiles(this.#directory);
-    for (const file of files)
+    for (const file of await this.#findFiles("**/*.{ts,tsx}"))
       await this.#analyzeFile(file, this.#directory);
     return this.#fileDependencies;
   }
-  async#findTypeScriptFiles(directory, {
+  async#findFiles(pattern, {
     excludeBuildFiles = false,
     excludeTestFiles = false
   } = {}) {
     const files = [];
-    const glob = new Bun.Glob("**/*.{ts,tsx}");
-    for await (const filePath of glob.scan({ cwd: directory, onlyFiles: true })) {
+    for await (const filePath of new Bun.Glob(pattern).scan({ cwd: this.#directory, onlyFiles: true })) {
       if (isSkippedPath(filePath))
         continue;
       if (excludeBuildFiles && filePath === "build.ts")
         continue;
       if (excludeTestFiles && testFileRegex.test(filePath))
         continue;
-      const fullPath = path.join(directory, filePath);
-      const relativePath = path.relative(this.#workspaceRoot, fullPath);
-      if (this.#ig.ignores(relativePath))
-        continue;
-      files.push(fullPath);
-    }
-    return files;
-  }
-  async#findCssFiles(directory) {
-    const files = [];
-    const glob = new Bun.Glob("**/*.css");
-    for await (const filePath of glob.scan({ cwd: directory, onlyFiles: true })) {
-      if (isSkippedPath(filePath))
-        continue;
-      const fullPath = path.join(directory, filePath);
-      const relativePath = path.relative(this.#workspaceRoot, fullPath);
-      if (this.#ig.ignores(relativePath))
-        continue;
-      files.push(fullPath);
+      const fullPath = path.join(this.#directory, filePath);
+      if (!this.#ig.ignores(path.relative(this.#workspaceRoot, fullPath)))
+        files.push(fullPath);
     }
     return files;
   }
@@ -179,7 +155,7 @@ class TypeScriptDependencyScanner2 {
       return;
     this.#visitedFiles.add(filePath);
     try {
-      const fileContent = await FileSys.readText(filePath);
+      const fileContent = await FileSys2.readText(filePath);
       const { imports, typeImports } = this.#extractImports(fileContent, filePath);
       const resolvedImports = await this.#resolveImports(imports, filePath, baseDir);
       const resolvedTypeImports = await this.#resolveImports(typeImports, filePath, baseDir);
@@ -191,19 +167,17 @@ class TypeScriptDependencyScanner2 {
   }
   async#resolveImports(imports, filePath, baseDir) {
     return await Promise.all(imports.map(async (importPath) => {
-      if (importPath.startsWith(".")) {
-        const resolvedPath = `./${path.join(path.relative(baseDir, filePath), importPath)}`;
-        return await this.#ensureExtension(resolvedPath);
-      }
-      return importPath;
+      if (!importPath.startsWith("."))
+        return importPath;
+      return await this.#ensureExtension(`./${path.join(path.relative(baseDir, filePath), importPath)}`);
     }));
   }
   async#ensureExtension(filePath) {
-    if (await FileSys.fileExists(`${filePath}.ts`))
+    if (await FileSys2.fileExists(`${filePath}.ts`))
       return `${filePath}.ts`;
-    else if (await FileSys.fileExists(`${filePath}.tsx`))
+    else if (await FileSys2.fileExists(`${filePath}.tsx`))
       return `${filePath}.tsx`;
-    else if (await FileSys.fileExists(filePath))
+    else if (await FileSys2.fileExists(filePath))
       return filePath;
     return `${filePath}.ts`;
   }
@@ -262,22 +236,14 @@ class TypeScriptDependencyScanner2 {
 `;
       const projectImports = imports.filter((i) => !i.startsWith("react") && !i.startsWith("@"));
       const externalImports = imports.filter((i) => i.startsWith("react") || i.startsWith("@"));
-      if (projectImports.length > 0) {
+      if (projectImports.length > 0)
         graph += `  Project dependencies:
-`;
-        projectImports.forEach((imp) => {
-          graph += `    \u2192 ${imp}
-`;
-        });
-      }
-      if (externalImports.length > 0) {
+${projectImports.map((imp) => `    \u2192 ${imp}
+`).join("")}`;
+      if (externalImports.length > 0)
         graph += `  External dependencies:
-`;
-        externalImports.forEach((imp) => {
-          graph += `    \u2192 ${imp}
-`;
-        });
-      }
+${externalImports.map((imp) => `    \u2192 ${imp}
+`).join("")}`;
       graph += `
 `;
     }

package/index-2wc41k5w.js

@@ -0,0 +1,49 @@
+// @bun
+import {
+  GlobalConfig,
+  CloudApi
+} from "./index-94s080qm.js";
+
+// pkgs/@akanjs/cli/tunnel/TunnelShare.ts
+import { TunnelAgent } from "akanjs/server/tunnel";
+
+class TunnelShare2 {
+  #api;
+  #agent;
+  grant;
+  #closed = false;
+  constructor(api, agent, grant) {
+    this.#api = api;
+    this.#agent = agent;
+    this.grant = grant;
+  }
+  static async open(app, { workspace, host, port, ttlMinutes, onLost }) {
+    const api = await CloudApi.fromHost(workspace, host ?? GlobalConfig.akanCloudHost);
+    const grant = await api.requestTunnel({ name: app.name, ...ttlMinutes ? { ttlMinutes } : {} });
+    const origin = `http://localhost:${port ?? await app.getDevPort()}`;
+    const agent = new TunnelAgent({
+      gatewayUrl: grant.gatewayUrl,
+      token: grant.token,
+      hostnames: [grant.hostname],
+      origin,
+      name: app.name,
+      ...onLost ? { onLost } : {}
+    });
+    await agent.start();
+    return new TunnelShare2(api, agent, grant);
+  }
+  get url() {
+    return this.grant.url;
+  }
+  async close() {
+    if (this.#closed)
+      return;
+    this.#closed = true;
+    await this.#agent.stop("cli exited");
+    try {
+      await this.#api.revokeTunnel(this.grant.code);
+    } catch {}
+  }
+}
+
+export { TunnelShare2 };

package/index-3hx1z96c.js

@@ -0,0 +1,87 @@
+// @bun
+// pkgs/@akanjs/devkit/cloud/configLock.ts
+import { mkdir, open, readFile, rm, stat } from "fs/promises";
+import path from "path";
+
+class ConfigLock {
+  static waitTimeoutMs = 30000;
+  static #unknownHolderStaleMs = 1e4;
+  static #pollMs = 50;
+  static async run(lockPath, fn) {
+    await mkdir(path.dirname(lockPath), { recursive: true, mode: 448 });
+    const deadline = Date.now() + ConfigLock.waitTimeoutMs;
+    while (!await ConfigLock.#take(lockPath)) {
+      if (Date.now() >= deadline) {
+        const holder = (await ConfigLock.#holder(lockPath))?.pid ?? "unknown";
+        throw new Error(`${lockPath} is held by process ${holder}; if no akan command is running, delete it and retry.`);
+      }
+      await ConfigLock.#reclaimIfAbandoned(lockPath);
+      await Bun.sleep(ConfigLock.#pollMs);
+    }
+    try {
+      return await fn();
+    } finally {
+      await rm(lockPath, { force: true });
+    }
+  }
+  static async#take(lockPath) {
+    const handle = await open(lockPath, "wx", 384).catch((error) => {
+      if (error.code === "EEXIST")
+        return null;
+      throw error;
+    });
+    if (!handle)
+      return false;
+    try {
+      await handle.writeFile(JSON.stringify({ pid: process.pid, at: Date.now() }));
+    } finally {
+      await handle.close();
+    }
+    return true;
+  }
+  static async#reclaimIfAbandoned(lockPath) {
+    if (!await ConfigLock.#abandoned(lockPath))
+      return;
+    const guard = `${lockPath}.reclaim`;
+    if (!await ConfigLock.#take(guard)) {
+      if (await ConfigLock.#abandoned(guard))
+        await rm(guard, { force: true });
+      return;
+    }
+    try {
+      if (await ConfigLock.#abandoned(lockPath))
+        await rm(lockPath, { force: true });
+    } finally {
+      await rm(guard, { force: true });
+    }
+  }
+  static async#abandoned(lockPath) {
+    const info = await stat(lockPath).catch(() => null);
+    if (!info)
+      return false;
+    const holder = await ConfigLock.#holder(lockPath);
+    if (!holder)
+      return Date.now() - info.mtimeMs > ConfigLock.#unknownHolderStaleMs;
+    return !ConfigLock.#isAlive(holder.pid);
+  }
+  static async#holder(lockPath) {
+    try {
+      const parsed = JSON.parse(await readFile(lockPath, "utf8"));
+      return typeof parsed.pid === "number" && typeof parsed.at === "number" ? { pid: parsed.pid, at: parsed.at } : null;
+    } catch {
+      return null;
+    }
+  }
+  static #isAlive(pid) {
+    if (!Number.isInteger(pid) || pid <= 0)
+      return false;
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch (error) {
+      return error.code === "EPERM";
+    }
+  }
+}
+
+export { ConfigLock };