openai-oauth 1.0.0 → 1.0.2

package/dist/{chunk-WDJBHN6N.js → chunk-2AENSHRT.js}

@@ -22029,7 +22029,8 @@ var toModelMessages = (messages) => {
   const modelMessages = [];
   const toolNamesById = /* @__PURE__ */ new Map();
   for (const message of messages) {
-    switch (message.role) {
+    const role = Array.isArray(message.tool_calls) && message.tool_calls.length > 0 ? "assistant" : typeof message.tool_call_id === "string" ? "tool" : message.role;
+    switch (role) {
       case "system":
       case "developer":
         modelMessages.push({
@@ -22728,11 +22729,12 @@ var createOpenAIOAuthFetchHandler = (settings = {}) => {
 };
 var startOpenAIOAuthServer = async (settings = {}) => {
   const host = settings.host ?? DEFAULT_HOST;
-  const port = settings.port ?? DEFAULT_PORT;
+  const requestedPort = settings.port ?? DEFAULT_PORT;
   const handler = createOpenAIOAuthFetchHandler(settings);
-  const server = createServer(async (req, res) => {
+  let selectedPort = requestedPort;
+  const createNodeServer = () => createServer(async (req, res) => {
     try {
-      const request = await toWebRequest(req, { host, port });
+      const request = await toWebRequest(req, { host, port: selectedPort });
       const response = await handler(request);
       await writeWebResponse(res, response);
     } catch (error40) {
@@ -22741,16 +22743,52 @@ var startOpenAIOAuthServer = async (settings = {}) => {
         return;
       }
       const message = error40 instanceof Error ? error40.message : "Unexpected server error.";
-      await writeWebResponse(res, toErrorResponse(message, 500, "server_error"));
+      await writeWebResponse(
+        res,
+        toErrorResponse(message, 500, "server_error")
+      );
     }
   });
-  await new Promise((resolve, reject) => {
-    server.once("error", reject);
-    server.listen(port, host, () => {
-      server.off("error", reject);
-      resolve();
+  let server = createNodeServer();
+  if (requestedPort === 0) {
+    await new Promise((resolve, reject) => {
+      server.once("error", reject);
+      server.listen(0, host, () => {
+        server.off("error", reject);
+        resolve();
+      });
     });
-  });
+  } else {
+    for (let port = requestedPort; port <= 65535; port += 1) {
+      try {
+        server = createNodeServer();
+        await new Promise((resolve, reject) => {
+          const handleError = (error40) => {
+            server.off("listening", handleListening);
+            reject(error40);
+          };
+          const handleListening = () => {
+            server.off("error", handleError);
+            resolve();
+          };
+          server.once("error", handleError);
+          server.once("listening", handleListening);
+          server.listen(port, host);
+        });
+        selectedPort = port;
+        break;
+      } catch (error40) {
+        if (!(error40 instanceof Error && "code" in error40 && error40.code === "EADDRINUSE")) {
+          throw error40;
+        }
+      }
+    }
+    if (!server.listening) {
+      throw new Error(
+        `Could not find an available port on ${host} starting at ${requestedPort}.`
+      );
+    }
+  }
   const address = resolveAddress(server.address(), host);
   return {
     server,

package/dist/cli.js

@@ -5,7 +5,7 @@ import {
   resolveAuthFileCandidates,
   resolveOpenAIOAuthModels,
   startOpenAIOAuthServer
-} from "./chunk-WDJBHN6N.js";
+} from "./chunk-2AENSHRT.js";
 
 // src/cli-app.ts
 import { access } from "fs/promises";
@@ -15,7 +15,7 @@ import { hideBin } from "yargs/helpers";
 // package.json
 var package_default = {
   name: "openai-oauth",
-  version: "1.0.0",
+  version: "1.0.2",
   description: "Free OpenAI API access with your ChatGPT account.",
   type: "module",
   bin: {
@@ -33,16 +33,17 @@ var package_default = {
   scripts: {
     build: "tsup src/index.ts src/cli.ts --format esm --dts --outDir dist --clean",
     dev: "bun ./src/cli.ts",
+    prepublishOnly: "bun run build",
     typecheck: "tsc --noEmit",
     test: "vitest run",
     "test:live": "LIVE_CODEX_E2E=1 vitest run test/live.e2e.test.ts"
   },
   dependencies: {
-    ai: "6.0.0-beta.138",
+    ai: "6.0.116",
     yargs: "^17.7.2"
   },
   devDependencies: {
-    "@ai-sdk/openai": "3.0.0-beta.87",
+    "@ai-sdk/openai": "3.0.41",
     "@types/node": "20.17.24",
     "@types/yargs": "^17.0.33",
     "openai-oauth-core": "workspace:*",
@@ -319,6 +320,12 @@ var runCli = async (argv = hideBin(process.argv)) => {
     }
   );
   const server = await startOpenAIOAuthServer(options);
+  if ((options.port ?? DEFAULT_PORT) !== server.port) {
+    console.log(
+      `Port ${options.port ?? DEFAULT_PORT} was unavailable. Using port ${server.port} instead.
+`
+    );
+  }
   console.log(
     toStartupMessage(
       `http://${server.host}:${server.port}/v1`,

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   createOpenAIOAuthFetchHandler,
   defaultOpenAIOAuthModels,
   startOpenAIOAuthServer
-} from "./chunk-WDJBHN6N.js";
+} from "./chunk-2AENSHRT.js";
 export {
   createOpenAIOAuthFetchHandler,
   defaultOpenAIOAuthModels,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "openai-oauth",
-	"version": "1.0.0",
+	"version": "1.0.2",
 	"description": "Free OpenAI API access with your ChatGPT account.",
 	"type": "module",
 	"bin": {
@@ -18,16 +18,17 @@
 	"scripts": {
 		"build": "tsup src/index.ts src/cli.ts --format esm --dts --outDir dist --clean",
 		"dev": "bun ./src/cli.ts",
+		"prepublishOnly": "bun run build",
 		"typecheck": "tsc --noEmit",
 		"test": "vitest run",
 		"test:live": "LIVE_CODEX_E2E=1 vitest run test/live.e2e.test.ts"
 	},
 	"dependencies": {
-		"ai": "6.0.0-beta.138",
+		"ai": "6.0.116",
 		"yargs": "^17.7.2"
 	},
 	"devDependencies": {
-		"@ai-sdk/openai": "3.0.0-beta.87",
+		"@ai-sdk/openai": "3.0.41",
 		"@types/node": "20.17.24",
 		"@types/yargs": "^17.0.33",
 		"openai-oauth-core": "workspace:*",