@ceki/sdk 1.9.2 → 1.11.0

package/dist/index.d.cts

@@ -6,7 +6,7 @@ interface ConnectOptions {
     reconnect?: boolean;
 }
 interface BrowserOption {
-    schedule_id: number;
+    browser_id: number;
     user_id?: number | null;
     geo?: string | null;
     language?: string | null;
@@ -23,7 +23,7 @@ interface BrowserOption {
 }
 interface Match {
     session_id: string;
-    schedule_id: number;
+    browser_id: number;
     event_id?: string | null;
     chat_topic_id?: string | null;
     provider_user_id?: number | null;
@@ -91,7 +91,7 @@ interface ChatHistoryOptions {
 }
 interface SessionInfo {
     id: number;
-    schedule_id: number;
+    browser_id: number;
     started_at: string | null;
     ended_at: string | null;
     status: string;
@@ -208,7 +208,6 @@ type UserEventHandler = (events: Record<string, unknown>[]) => void;
 declare class Browser {
     readonly sessionId: string;
     readonly browserId: number;
-    readonly scheduleId: number;
     readonly chatTopicId: string | null;
     readonly browserInfo: Record<string, unknown>;
     readonly providerUserId: number | null;
@@ -254,7 +253,8 @@ declare class Browser {
         data: string;
     } | Buffer>;
     snapshot(): Promise<Snapshot>;
-    upload(selector: string, source: string | Buffer, filename?: string): Promise<{
+    private static _detectMime;
+    upload(selector: string, source: string | Buffer, filename?: string, mime?: string): Promise<{
         ok: boolean;
         filename: string;
         size: number;
@@ -334,7 +334,7 @@ declare class Client {
         limit?: number;
     }): Promise<SessionInfo[]>;
     myBrowsers(): Promise<BrowserOption[]>;
-    rent(scheduleId: number, opts?: RentOptions): Promise<Browser>;
+    rent(browserId: number, opts?: RentOptions): Promise<Browser>;
     resume(sessionId: string, opts?: RentOptions): Promise<Browser>;
     close(): Promise<void>;
     disconnect(): Promise<void>;

package/dist/index.d.ts

@@ -6,7 +6,7 @@ interface ConnectOptions {
     reconnect?: boolean;
 }
 interface BrowserOption {
-    schedule_id: number;
+    browser_id: number;
     user_id?: number | null;
     geo?: string | null;
     language?: string | null;
@@ -23,7 +23,7 @@ interface BrowserOption {
 }
 interface Match {
     session_id: string;
-    schedule_id: number;
+    browser_id: number;
     event_id?: string | null;
     chat_topic_id?: string | null;
     provider_user_id?: number | null;
@@ -91,7 +91,7 @@ interface ChatHistoryOptions {
 }
 interface SessionInfo {
     id: number;
-    schedule_id: number;
+    browser_id: number;
     started_at: string | null;
     ended_at: string | null;
     status: string;
@@ -208,7 +208,6 @@ type UserEventHandler = (events: Record<string, unknown>[]) => void;
 declare class Browser {
     readonly sessionId: string;
     readonly browserId: number;
-    readonly scheduleId: number;
     readonly chatTopicId: string | null;
     readonly browserInfo: Record<string, unknown>;
     readonly providerUserId: number | null;
@@ -254,7 +253,8 @@ declare class Browser {
         data: string;
     } | Buffer>;
     snapshot(): Promise<Snapshot>;
-    upload(selector: string, source: string | Buffer, filename?: string): Promise<{
+    private static _detectMime;
+    upload(selector: string, source: string | Buffer, filename?: string, mime?: string): Promise<{
         ok: boolean;
         filename: string;
         size: number;
@@ -334,7 +334,7 @@ declare class Client {
         limit?: number;
     }): Promise<SessionInfo[]>;
     myBrowsers(): Promise<BrowserOption[]>;
-    rent(scheduleId: number, opts?: RentOptions): Promise<Browser>;
+    rent(browserId: number, opts?: RentOptions): Promise<Browser>;
     resume(sessionId: string, opts?: RentOptions): Promise<Browser>;
     close(): Promise<void>;
     disconnect(): Promise<void>;

package/dist/index.js

@@ -133,6 +133,9 @@ var ChatSendFailed = class extends CekiBrowserError {
   }
 };
 
+// src/browser.ts
+import mime from "mime-types";
+
 // src/chat.ts
 import * as crypto from "crypto";
 import * as fs from "fs";
@@ -198,7 +201,7 @@ var BrowserChat = class {
     if (buf.length > MAX_IMAGE_SIZE) {
       throw new Error(`Image too large: ${buf.length} bytes (max ${MAX_IMAGE_SIZE})`);
     }
-    const { mime, ext } = detectMime(buf);
+    const { mime: mime2, ext } = detectMime(buf);
     if (!filename.includes(".")) {
       filename = `${filename}.${ext}`;
     }
@@ -209,7 +212,7 @@ var BrowserChat = class {
       session_id: this._browser.sessionId,
       client_msg_id: clientMsgId,
       filename,
-      mime,
+      mime: mime2,
       data_b64
     };
     if (text) msg.text = text;
@@ -558,10 +561,9 @@ function keymapForChar(char) {
 }
 
 // src/browser.ts
-var Browser = class {
+var Browser = class _Browser {
   sessionId;
   browserId;
-  scheduleId;
   chatTopicId;
   browserInfo;
   providerUserId;
@@ -607,8 +609,7 @@ var Browser = class {
   constructor(client, match, humanizer) {
     this._client = client;
     this.sessionId = match.session_id;
-    this.browserId = match.schedule_id;
-    this.scheduleId = match.schedule_id;
+    this.browserId = match.browser_id;
     this.chatTopicId = match.chat_topic_id ?? null;
     this.browserInfo = match.browser_info ?? {};
     this.providerUserId = match.provider_user_id ?? null;
@@ -623,7 +624,7 @@ var Browser = class {
     saveSession(this.sessionId, {
       session_id: this.sessionId,
       chat_topic_id: this.chatTopicId,
-      schedule_id: this.scheduleId,
+      browser_id: this.browserId,
       last_seen_ts: this._lastSeenTs
     });
   }
@@ -798,7 +799,10 @@ var Browser = class {
       ts: /* @__PURE__ */ new Date()
     };
   }
-  async upload(selector, source, filename) {
+  static _detectMime(filename) {
+    return mime.lookup(filename) || "application/octet-stream";
+  }
+  async upload(selector, source, filename, mime2) {
     let buf;
     let resolvedFilename;
     if (typeof source === "string") {
@@ -810,6 +814,8 @@ var Browser = class {
       buf = Buffer.isBuffer(source) ? source : Buffer.from(source);
       resolvedFilename = filename ?? "file";
     }
+    const mimeType = mime2 ?? _Browser._detectMime(resolvedFilename);
+    console.info(`upload: file=${resolvedFilename} mime=${mimeType} size=${buf.length}`);
     const b64 = buf.toString("base64");
     const size = buf.length;
     const expression = `
@@ -820,7 +826,7 @@ var Browser = class {
         var binary = atob(b64);
         var bytes = new Uint8Array(binary.length);
         for (var i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
-        var file = new File([bytes], ${JSON.stringify(resolvedFilename)}, {type: 'application/octet-stream'});
+        var file = new File([bytes], ${JSON.stringify(resolvedFilename)}, {type: ${JSON.stringify(mimeType)}});
         var dt = new DataTransfer();
         dt.items.add(file);
         input.files = dt.files;
@@ -833,6 +839,17 @@ var Browser = class {
       params: { expression, returnByValue: true }
     });
     const resultObj = result?.result;
+    try {
+      await this.send({
+        method: "Input.dispatchKeyEvent",
+        params: { type: "keyDown", key: "Escape", code: "Escape", windowsVirtualKeyCode: 27, nativeVirtualKeyCode: 27 }
+      });
+      await this.send({
+        method: "Input.dispatchKeyEvent",
+        params: { type: "keyUp", key: "Escape", code: "Escape", windowsVirtualKeyCode: 27, nativeVirtualKeyCode: 27 }
+      });
+    } catch {
+    }
     if (resultObj?.value) {
       return JSON.parse(String(resultObj.value));
     }
@@ -1376,7 +1393,7 @@ var Client = class _Client {
   _pongTimer = null;
   _lastPongAt = 0;
   _pendingRents = /* @__PURE__ */ new Map();
-  // keyed by `rent:<scheduleId>` or eventId
+  // keyed by `rent:<browserId>` or eventId
   _pendingResumes = /* @__PURE__ */ new Map();
   // keyed by sessionId
   _connectResolve = null;
@@ -1467,18 +1484,18 @@ var Client = class _Client {
     const items = body.browsers ?? body.data ?? body;
     return Array.isArray(items) ? items : [];
   }
-  async rent(scheduleId, opts) {
-    const rentMsg = { type: "rent", browser_id: scheduleId };
+  async rent(browserId, opts) {
+    const rentMsg = { type: "rent", browser_id: browserId };
     if (opts?.mode) rentMsg.mode = opts.mode;
     this._wsSend(rentMsg);
-    const key = `rent:${scheduleId}`;
+    const key = `rent:${browserId}`;
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         this._pendingRents.delete(key);
         reject(new TimeoutError("Rent timed out after 90s"));
       }, 9e4);
       this._pendingRents.set(key, {
-        scheduleId,
+        browserId,
         eventId: null,
         opts,
         resolve: (match) => {
@@ -1783,7 +1800,7 @@ var Client = class _Client {
   }
   _onMatch(msg) {
     const eventId = String(msg.event_id ?? "");
-    const scheduleId = Number(msg.schedule_id ?? 0);
+    const browserId = Number(msg.browser_id ?? 0);
     const sessionId = String(msg.session_id ?? "");
     if (msg.requires_ack) {
       try {
@@ -1793,15 +1810,15 @@ var Client = class _Client {
     }
     let pending = this._pendingRents.get(`event:${eventId}`);
     if (!pending) {
-      pending = this._pendingRents.get(`rent:${scheduleId}`);
+      pending = this._pendingRents.get(`rent:${browserId}`);
     }
     if (pending) {
       clearTimeout(pending.timer);
-      const key = pending.eventId ? `event:${pending.eventId}` : `rent:${pending.scheduleId}`;
+      const key = pending.eventId ? `event:${pending.eventId}` : `rent:${pending.browserId}`;
       this._pendingRents.delete(key);
       const match = {
         session_id: sessionId,
-        schedule_id: scheduleId,
+        browser_id: browserId,
         event_id: eventId || null,
         chat_topic_id: msg.chat_topic_id ? String(msg.chat_topic_id) : null,
         provider_user_id: msg.provider_user_id != null ? Number(msg.provider_user_id) : null,
@@ -1843,7 +1860,7 @@ var Client = class _Client {
     const match = {
       session_id: sessionId,
       event_id: msg.event_id != null ? String(msg.event_id) : null,
-      schedule_id: Number(msg.schedule_id ?? 0),
+      browser_id: Number(msg.browser_id ?? 0),
       chat_topic_id: msg.chat_topic_id ? String(msg.chat_topic_id) : null,
       provider_user_id: msg.provider_user_id != null ? Number(msg.provider_user_id) : null,
       started_at: Date.now(),