openaihub 1.1.4 → 1.1.6

package/README.md

@@ -1,27 +1,27 @@
-# OpenAI Hub npm package
-
-Install globally:
-
-```bash
-npm install -g openaihub
-```
-
-Current support: Windows x64.
-
-Runtime location after install:
-
-```text
-%USERPROFILE%/.openaihub/npm-runtime
-```
-
-Then run:
-
-```bash
-openaihub
-```
-
-Or:
-
-```bash
-OAH
-```
+# OpenAI Hub npm package
+
+Install globally:
+
+```bash
+npm install -g openaihub
+```
+
+Current support: Windows x64.
+
+Runtime location after install:
+
+```text
+%USERPROFILE%/.openaihub/npm-runtime
+```
+
+Then run:
+
+```bash
+openaihub
+```
+
+Or:
+
+```bash
+OAH
+```

package/bin/OAH.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
-require('../lib/run').main();
+#!/usr/bin/env node
+
+require('../lib/run').main();

package/bin/openaihub.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
-
-require('../lib/run').main();
+#!/usr/bin/env node
+
+require('../lib/run').main();

package/lib/config.js

@@ -1,43 +1,43 @@
-'use strict';
-
-const os = require('node:os');
-const path = require('node:path');
-
-const packageRoot = path.resolve(__dirname, '..');
-const runtimeRoot = path.join(os.homedir(), '.openaihub', 'npm-runtime');
-const bundledRuntimeRoot = path.join(packageRoot, 'runtime');
-
-const packageInfo = require(path.join(packageRoot, 'package.json'));
-
-function getPlatformConfig() {
-  const platform = process.platform;
-  const arch = process.arch;
-
-  if (platform === 'win32' && arch === 'x64') {
-    return {
-      assetName: 'openaihub-windows.zip',
-      assetDownloadUrl: `https://github.com/gugezhanghao132-eng/openaihub/releases/download/${getTagName()}/openaihub-windows.zip`,
-      executableRelativePath: path.join('openaihub.exe'),
-      extractKind: 'zip',
-      runtimeKey: 'win32-x64'
-    };
-  }
-
-  throw new Error(`OpenAI Hub npm package does not support ${platform}-${arch} yet.`);
-}
-
-function getTagName() {
-  return `v${packageInfo.version}`;
-}
-
-module.exports = {
-  owner: 'gugezhanghao132-eng',
-  repo: 'openaihub',
-  packageName: packageInfo.name,
-  packageVersion: packageInfo.version,
-  packageRoot,
-  bundledRuntimeRoot,
-  runtimeRoot,
-  getTagName,
-  getPlatformConfig
-};
+'use strict';
+
+const os = require('node:os');
+const path = require('node:path');
+
+const packageRoot = path.resolve(__dirname, '..');
+const runtimeRoot = path.join(os.homedir(), '.openaihub', 'npm-runtime');
+const bundledRuntimeRoot = path.join(packageRoot, 'runtime');
+
+const packageInfo = require(path.join(packageRoot, 'package.json'));
+
+function getPlatformConfig() {
+  const platform = process.platform;
+  const arch = process.arch;
+
+  if (platform === 'win32' && arch === 'x64') {
+    return {
+      assetName: 'openaihub-windows.zip',
+      assetDownloadUrl: `https://github.com/gugezhanghao132-eng/openaihub/releases/download/${getTagName()}/openaihub-windows.zip`,
+      executableRelativePath: path.join('openaihub.exe'),
+      extractKind: 'zip',
+      runtimeKey: 'win32-x64'
+    };
+  }
+
+  throw new Error(`OpenAI Hub npm package does not support ${platform}-${arch} yet.`);
+}
+
+function getTagName() {
+  return `v${packageInfo.version}`;
+}
+
+module.exports = {
+  owner: 'gugezhanghao132-eng',
+  repo: 'openaihub',
+  packageName: packageInfo.name,
+  packageVersion: packageInfo.version,
+  packageRoot,
+  bundledRuntimeRoot,
+  runtimeRoot,
+  getTagName,
+  getPlatformConfig
+};

package/lib/install.js

@@ -1,245 +1,245 @@
-'use strict';
-
-const fs = require('node:fs');
-const fsp = require('node:fs/promises');
-const https = require('node:https');
-const os = require('node:os');
-const path = require('node:path');
-const { spawn } = require('node:child_process');
-
-const {
-  bundledRuntimeRoot,
-  packageVersion,
-  runtimeRoot,
-  getPlatformConfig,
-} = require('./config');
-
-function log(message) {
-  process.stdout.write(`[OpenAI Hub] ${message}\n`);
-}
-
-function downloadFile(url, targetPath, redirectsRemaining = 5) {
-  return new Promise((resolve, reject) => {
-    const requestUrl = (currentUrl, redirectsLeft) => {
-      const req = https.get(currentUrl, {
-        headers: {
-          'User-Agent': 'OpenAIHub-npm-installer'
-        }
-      }, (res) => {
-        if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-          if (redirectsLeft <= 0) {
-            reject(new Error(`Too many redirects while downloading ${url}`));
-            res.resume();
-            return;
-          }
-          res.resume();
-          requestUrl(res.headers.location, redirectsLeft - 1);
-          return;
-        }
-
-        if (res.statusCode !== 200) {
-          reject(new Error(`Download failed: ${res.statusCode} ${currentUrl}`));
-          res.resume();
-          return;
-        }
-
-        const file = fs.createWriteStream(targetPath);
-        res.pipe(file);
-        file.on('finish', () => {
-          file.close(resolve);
-        });
-        file.on('error', (error) => {
-          file.close(() => fs.rmSync(targetPath, { force: true }));
-          reject(error);
-        });
-      });
-
-      req.setTimeout(30000, () => {
-        req.destroy(new Error(`Download timed out: ${currentUrl}`));
-      });
-      req.on('error', reject);
-    };
-
-    requestUrl(url, redirectsRemaining);
-  });
-}
-
-function runCommand(command, args) {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: 'inherit',
-      windowsHide: true
-    });
-
-    child.on('error', reject);
-    child.on('exit', (code) => {
-      if (code === 0) {
-        resolve();
-        return;
-      }
-      reject(new Error(`${command} exited with code ${code}`));
-    });
-  });
-}
-
-async function withRetry(action, attempts, label) {
-  let lastError = null;
-  for (let attempt = 1; attempt <= attempts; attempt += 1) {
-    try {
-      return await action();
-    } catch (error) {
-      lastError = error;
-      if (attempt < attempts) {
-        log(`${label} failed, retrying (${attempt}/${attempts - 1})...`);
-        await new Promise((resolve) => setTimeout(resolve, 1500));
-      }
-    }
-  }
-  throw lastError;
-}
-
-async function acquireLock(lockPath, timeoutMs = 60000) {
-  const startedAt = Date.now();
-  while (true) {
-    try {
-      return await fsp.open(lockPath, 'wx');
-    } catch (error) {
-      if (error && error.code === 'EEXIST') {
-        if (Date.now() - startedAt >= timeoutMs) {
-          throw new Error(`Timed out waiting for install lock: ${lockPath}`);
-        }
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        continue;
-      }
-      throw error;
-    }
-  }
-}
-
-async function removePathWithRetry(targetPath, attempts = 5, delayMs = 400) {
-  for (let attempt = 1; attempt <= attempts; attempt += 1) {
-    try {
-      await fsp.rm(targetPath, { recursive: true, force: true });
-      return;
-    } catch (error) {
-      if (!error || !['EBUSY', 'EPERM', 'ENOTEMPTY'].includes(error.code) || attempt === attempts) {
-        throw error;
-      }
-      await new Promise((resolve) => setTimeout(resolve, delayMs * attempt));
-    }
-  }
-}
-
-async function extractArchive(archivePath, extractRoot, extractKind) {
-  if (extractKind === 'zip' && process.platform === 'win32') {
-    await runCommand('powershell.exe', [
-      '-NoProfile',
-      '-ExecutionPolicy',
-      'Bypass',
-      '-Command',
-      `Expand-Archive -Path '${archivePath.replace(/'/g, "''")}' -DestinationPath '${extractRoot.replace(/'/g, "''")}' -Force`
-    ]);
-    return;
-  }
-
-  throw new Error(`Unsupported archive extraction for ${process.platform}: ${extractKind}`);
-}
-
-function findExecutable(extractRoot, executableName) {
-  const stack = [extractRoot];
-  while (stack.length > 0) {
-    const current = stack.pop();
-    const entries = fs.readdirSync(current, { withFileTypes: true });
-    for (const entry of entries) {
-      const fullPath = path.join(current, entry.name);
-      if (entry.isDirectory()) {
-        stack.push(fullPath);
-        continue;
-      }
-      if (entry.isFile() && entry.name.toLowerCase() === executableName.toLowerCase()) {
-        return path.dirname(fullPath);
-      }
-    }
-  }
-  return null;
-}
-
-async function ensureInstalled(options = {}) {
-  const { quiet = false, force = false } = options;
-  const platformConfig = getPlatformConfig();
-  const runtimeBaseDir = path.join(runtimeRoot, platformConfig.runtimeKey);
-  const runtimeDir = path.join(runtimeBaseDir, packageVersion);
-  const executablePath = path.join(runtimeDir, platformConfig.executableRelativePath);
-  const bundledArchivePath = path.join(bundledRuntimeRoot, platformConfig.assetName);
-  const versionMarkerPath = path.join(runtimeDir, 'version.txt');
-
-  if (!force && fs.existsSync(executablePath) && fs.existsSync(versionMarkerPath)) {
-    const installedVersion = fs.readFileSync(versionMarkerPath, 'utf8').trim();
-    if (installedVersion === packageVersion) {
-      return { executablePath, runtimeDir, downloaded: false };
-    }
-  }
-
-  const tempRoot = await fsp.mkdtemp(path.join(os.tmpdir(), 'openaihub-npm-'));
-  const archivePath = path.join(tempRoot, platformConfig.assetName);
-  const extractRoot = path.join(tempRoot, 'extract');
-  const stageRoot = path.join(tempRoot, 'stage');
-  const lockPath = path.join(runtimeRoot, `${platformConfig.runtimeKey}.lock`);
-  let lockHandle = null;
-
-  try {
-    await fsp.mkdir(runtimeRoot, { recursive: true });
-    lockHandle = await acquireLock(lockPath);
-
-    if (!quiet) {
-      log(`Preparing OpenAI Hub ${packageVersion} for ${platformConfig.runtimeKey}...`);
-    }
-
-    await fsp.mkdir(extractRoot, { recursive: true });
-    await fsp.mkdir(stageRoot, { recursive: true });
-
-    if (fs.existsSync(bundledArchivePath)) {
-      if (!quiet) {
-        log(`Using bundled runtime archive ${platformConfig.assetName}...`);
-      }
-      await fsp.copyFile(bundledArchivePath, archivePath);
-    } else {
-      if (!quiet) {
-        log(`Downloading ${platformConfig.assetName}...`);
-      }
-      await withRetry(() => downloadFile(platformConfig.assetDownloadUrl, archivePath), 3, 'Runtime download');
-    }
-
-    if (!quiet) {
-      log('Extracting runtime...');
-    }
-    await extractArchive(archivePath, extractRoot, platformConfig.extractKind);
-
-    const extractedRuntimeRoot = findExecutable(extractRoot, path.basename(platformConfig.executableRelativePath));
-    if (!extractedRuntimeRoot) {
-      throw new Error(`Executable ${platformConfig.executableRelativePath} was not found in downloaded asset.`);
-    }
-
-    await fsp.cp(extractedRuntimeRoot, stageRoot, { recursive: true, force: true });
-    await fsp.writeFile(path.join(stageRoot, 'version.txt'), `${packageVersion}\n`, 'utf8');
-    await removePathWithRetry(runtimeDir);
-    await fsp.mkdir(runtimeBaseDir, { recursive: true });
-    await fsp.rename(stageRoot, runtimeDir);
-
-    if (!quiet) {
-      log('Runtime ready.');
-    }
-
-    return { executablePath, runtimeDir, downloaded: true };
-  } finally {
-    if (lockHandle) {
-      await lockHandle.close();
-    }
-    await fsp.rm(lockPath, { force: true });
-    await fsp.rm(tempRoot, { recursive: true, force: true });
-  }
-}
-
-module.exports = {
-  ensureInstalled
-};
+'use strict';
+
+const fs = require('node:fs');
+const fsp = require('node:fs/promises');
+const https = require('node:https');
+const os = require('node:os');
+const path = require('node:path');
+const { spawn } = require('node:child_process');
+
+const {
+  bundledRuntimeRoot,
+  packageVersion,
+  runtimeRoot,
+  getPlatformConfig,
+} = require('./config');
+
+function log(message) {
+  process.stdout.write(`[OpenAI Hub] ${message}\n`);
+}
+
+function downloadFile(url, targetPath, redirectsRemaining = 5) {
+  return new Promise((resolve, reject) => {
+    const requestUrl = (currentUrl, redirectsLeft) => {
+      const req = https.get(currentUrl, {
+        headers: {
+          'User-Agent': 'OpenAIHub-npm-installer'
+        }
+      }, (res) => {
+        if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          if (redirectsLeft <= 0) {
+            reject(new Error(`Too many redirects while downloading ${url}`));
+            res.resume();
+            return;
+          }
+          res.resume();
+          requestUrl(res.headers.location, redirectsLeft - 1);
+          return;
+        }
+
+        if (res.statusCode !== 200) {
+          reject(new Error(`Download failed: ${res.statusCode} ${currentUrl}`));
+          res.resume();
+          return;
+        }
+
+        const file = fs.createWriteStream(targetPath);
+        res.pipe(file);
+        file.on('finish', () => {
+          file.close(resolve);
+        });
+        file.on('error', (error) => {
+          file.close(() => fs.rmSync(targetPath, { force: true }));
+          reject(error);
+        });
+      });
+
+      req.setTimeout(30000, () => {
+        req.destroy(new Error(`Download timed out: ${currentUrl}`));
+      });
+      req.on('error', reject);
+    };
+
+    requestUrl(url, redirectsRemaining);
+  });
+}
+
+function runCommand(command, args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, args, {
+      stdio: 'inherit',
+      windowsHide: true
+    });
+
+    child.on('error', reject);
+    child.on('exit', (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`${command} exited with code ${code}`));
+    });
+  });
+}
+
+async function withRetry(action, attempts, label) {
+  let lastError = null;
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      return await action();
+    } catch (error) {
+      lastError = error;
+      if (attempt < attempts) {
+        log(`${label} failed, retrying (${attempt}/${attempts - 1})...`);
+        await new Promise((resolve) => setTimeout(resolve, 1500));
+      }
+    }
+  }
+  throw lastError;
+}
+
+async function acquireLock(lockPath, timeoutMs = 60000) {
+  const startedAt = Date.now();
+  while (true) {
+    try {
+      return await fsp.open(lockPath, 'wx');
+    } catch (error) {
+      if (error && error.code === 'EEXIST') {
+        if (Date.now() - startedAt >= timeoutMs) {
+          throw new Error(`Timed out waiting for install lock: ${lockPath}`);
+        }
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        continue;
+      }
+      throw error;
+    }
+  }
+}
+
+async function removePathWithRetry(targetPath, attempts = 5, delayMs = 400) {
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      await fsp.rm(targetPath, { recursive: true, force: true });
+      return;
+    } catch (error) {
+      if (!error || !['EBUSY', 'EPERM', 'ENOTEMPTY'].includes(error.code) || attempt === attempts) {
+        throw error;
+      }
+      await new Promise((resolve) => setTimeout(resolve, delayMs * attempt));
+    }
+  }
+}
+
+async function extractArchive(archivePath, extractRoot, extractKind) {
+  if (extractKind === 'zip' && process.platform === 'win32') {
+    await runCommand('powershell.exe', [
+      '-NoProfile',
+      '-ExecutionPolicy',
+      'Bypass',
+      '-Command',
+      `Expand-Archive -Path '${archivePath.replace(/'/g, "''")}' -DestinationPath '${extractRoot.replace(/'/g, "''")}' -Force`
+    ]);
+    return;
+  }
+
+  throw new Error(`Unsupported archive extraction for ${process.platform}: ${extractKind}`);
+}
+
+function findExecutable(extractRoot, executableName) {
+  const stack = [extractRoot];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    const entries = fs.readdirSync(current, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path.join(current, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(fullPath);
+        continue;
+      }
+      if (entry.isFile() && entry.name.toLowerCase() === executableName.toLowerCase()) {
+        return path.dirname(fullPath);
+      }
+    }
+  }
+  return null;
+}
+
+async function ensureInstalled(options = {}) {
+  const { quiet = false, force = false } = options;
+  const platformConfig = getPlatformConfig();
+  const runtimeBaseDir = path.join(runtimeRoot, platformConfig.runtimeKey);
+  const runtimeDir = path.join(runtimeBaseDir, packageVersion);
+  const executablePath = path.join(runtimeDir, platformConfig.executableRelativePath);
+  const bundledArchivePath = path.join(bundledRuntimeRoot, platformConfig.assetName);
+  const versionMarkerPath = path.join(runtimeDir, 'version.txt');
+
+  if (!force && fs.existsSync(executablePath) && fs.existsSync(versionMarkerPath)) {
+    const installedVersion = fs.readFileSync(versionMarkerPath, 'utf8').trim();
+    if (installedVersion === packageVersion) {
+      return { executablePath, runtimeDir, downloaded: false };
+    }
+  }
+
+  const tempRoot = await fsp.mkdtemp(path.join(os.tmpdir(), 'openaihub-npm-'));
+  const archivePath = path.join(tempRoot, platformConfig.assetName);
+  const extractRoot = path.join(tempRoot, 'extract');
+  const stageRoot = path.join(tempRoot, 'stage');
+  const lockPath = path.join(runtimeRoot, `${platformConfig.runtimeKey}.lock`);
+  let lockHandle = null;
+
+  try {
+    await fsp.mkdir(runtimeRoot, { recursive: true });
+    lockHandle = await acquireLock(lockPath);
+
+    if (!quiet) {
+      log(`Preparing OpenAI Hub ${packageVersion} for ${platformConfig.runtimeKey}...`);
+    }
+
+    await fsp.mkdir(extractRoot, { recursive: true });
+    await fsp.mkdir(stageRoot, { recursive: true });
+
+    if (fs.existsSync(bundledArchivePath)) {
+      if (!quiet) {
+        log(`Using bundled runtime archive ${platformConfig.assetName}...`);
+      }
+      await fsp.copyFile(bundledArchivePath, archivePath);
+    } else {
+      if (!quiet) {
+        log(`Downloading ${platformConfig.assetName}...`);
+      }
+      await withRetry(() => downloadFile(platformConfig.assetDownloadUrl, archivePath), 3, 'Runtime download');
+    }
+
+    if (!quiet) {
+      log('Extracting runtime...');
+    }
+    await extractArchive(archivePath, extractRoot, platformConfig.extractKind);
+
+    const extractedRuntimeRoot = findExecutable(extractRoot, path.basename(platformConfig.executableRelativePath));
+    if (!extractedRuntimeRoot) {
+      throw new Error(`Executable ${platformConfig.executableRelativePath} was not found in downloaded asset.`);
+    }
+
+    await fsp.cp(extractedRuntimeRoot, stageRoot, { recursive: true, force: true });
+    await fsp.writeFile(path.join(stageRoot, 'version.txt'), `${packageVersion}\n`, 'utf8');
+    await removePathWithRetry(runtimeDir);
+    await fsp.mkdir(runtimeBaseDir, { recursive: true });
+    await fsp.rename(stageRoot, runtimeDir);
+
+    if (!quiet) {
+      log('Runtime ready.');
+    }
+
+    return { executablePath, runtimeDir, downloaded: true };
+  } finally {
+    if (lockHandle) {
+      await lockHandle.close();
+    }
+    await fsp.rm(lockPath, { force: true });
+    await fsp.rm(tempRoot, { recursive: true, force: true });
+  }
+}
+
+module.exports = {
+  ensureInstalled
+};

package/lib/run.js

@@ -1,35 +1,35 @@
-'use strict';
-
-const { spawn } = require('node:child_process');
-
-const { ensureInstalled } = require('./install');
-
-async function main() {
-  try {
-    const { executablePath } = await ensureInstalled({ quiet: true });
-    const child = spawn(executablePath, process.argv.slice(2), {
-      stdio: 'inherit',
-      windowsHide: false
-    });
-
-    child.on('exit', (code, signal) => {
-      if (signal) {
-        process.kill(process.pid, signal);
-        return;
-      }
-      process.exit(code === null ? 1 : code);
-    });
-
-    child.on('error', (error) => {
-      process.stderr.write(`[OpenAI Hub] Failed to launch runtime: ${error.message}\n`);
-      process.exit(1);
-    });
-  } catch (error) {
-    process.stderr.write(`[OpenAI Hub] ${error.message}\n`);
-    process.exit(1);
-  }
-}
-
-module.exports = {
-  main
-};
+'use strict';
+
+const { spawn } = require('node:child_process');
+
+const { ensureInstalled } = require('./install');
+
+async function main() {
+  try {
+    const { executablePath } = await ensureInstalled({ quiet: true });
+    const child = spawn(executablePath, process.argv.slice(2), {
+      stdio: 'inherit',
+      windowsHide: false
+    });
+
+    child.on('exit', (code, signal) => {
+      if (signal) {
+        process.kill(process.pid, signal);
+        return;
+      }
+      process.exit(code === null ? 1 : code);
+    });
+
+    child.on('error', (error) => {
+      process.stderr.write(`[OpenAI Hub] Failed to launch runtime: ${error.message}\n`);
+      process.exit(1);
+    });
+  } catch (error) {
+    process.stderr.write(`[OpenAI Hub] ${error.message}\n`);
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  main
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openaihub",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "OpenAI Hub CLI installer and launcher",
   "license": "MIT",
   "os": [

package/scripts/postinstall.js

@@ -1,9 +1,9 @@
-'use strict';
-
-const { ensureInstalled } = require('../lib/install');
-
-ensureInstalled()
-  .catch((error) => {
-    process.stderr.write(`[OpenAI Hub] postinstall warning: ${error.message}\n`);
-    process.stderr.write('[OpenAI Hub] The runtime will be downloaded automatically on first launch.\n');
-  });
+'use strict';
+
+const { ensureInstalled } = require('../lib/install');
+
+ensureInstalled()
+  .catch((error) => {
+    process.stderr.write(`[OpenAI Hub] postinstall warning: ${error.message}\n`);
+    process.stderr.write('[OpenAI Hub] The runtime will be downloaded automatically on first launch.\n');
+  });