@openclawcity/openclawcity 1.0.3 → 1.0.5

package/dist/adapter.d.ts

@@ -25,6 +25,8 @@ export declare class OpenClawCityAdapter {
     private pingInterval;
     private reconnectTimer;
     private pendingReject;
+    private doneResolve;
+    readonly done: Promise<void>;
     private readonly gatewayUrl;
     private readonly botId;
     private readonly token;

package/dist/index.js

@@ -3753,6 +3753,9 @@ var OpenClawCityAdapter = class {
   reconnectTimer = null;
   // Used to reject the openSocket promise on pre-welcome errors
   pendingReject = null;
+  // Resolves when stop() is called — keeps startAccount promise pending
+  doneResolve = null;
+  done;
   gatewayUrl;
   botId;
   token;
@@ -3776,6 +3779,9 @@ var OpenClawCityAdapter = class {
     this.onError = opts.onError;
     this.onStateChange = opts.onStateChange;
     this.logger = opts.logger ?? {};
+    this.done = new Promise((resolve) => {
+      this.doneResolve = resolve;
+    });
     if (opts.signal) {
       opts.signal.addEventListener("abort", () => this.stop(), { once: true });
     }
@@ -3808,6 +3814,7 @@ var OpenClawCityAdapter = class {
     }
     this.closeSocket();
     this.setState(ConnectionState.DISCONNECTED);
+    this.doneResolve?.();
   }
   sendReply(reply) {
     this.send(reply);
@@ -4114,7 +4121,9 @@ var occPlugin = {
     startAccount: async (ctx) => {
       const rt = getRuntime();
       const { cfg, accountId, account, abortSignal, log } = ctx;
+      log?.info?.(`[OCC] startAccount called for ${accountId}, abortSignal.aborted=${abortSignal.aborted}`);
       ctx.setStatus({ accountId, running: true, connected: false, lastStartAt: Date.now() });
+      log?.info?.(`[OCC] setStatus: running=true, connected=false`);
       const adapter = new OpenClawCityAdapter({
         config: account,
         logger: log,
@@ -4218,7 +4227,7 @@ var occPlugin = {
         },
         onWelcome: (welcome) => {
           const nearby = welcome.nearby_bots ?? welcome.nearby ?? [];
-          log?.info?.(`Connected to OpenClawCity. Location: ${welcome.location?.zoneName ?? "unknown"}, Nearby: ${nearby.length} bots`);
+          log?.info?.(`[OCC] Connected to OpenClawCity. Location: ${welcome.location?.zoneName ?? welcome.location?.zone_name ?? "unknown"}, Nearby: ${nearby.length} bots`);
           ctx.setStatus({
             accountId,
             running: true,
@@ -4226,28 +4235,24 @@ var occPlugin = {
             lastConnectedAt: Date.now(),
             lastError: null
           });
+          log?.info?.(`[OCC] setStatus: running=true, connected=true`);
         },
         onError: (error) => {
-          log?.error?.(`Server error: ${error.reason}`);
+          log?.error?.(`[OCC] Server error: ${error.reason} \u2014 ${error.message ?? ""}`);
           ctx.setStatus({
             ...ctx.getStatus(),
             lastError: `${error.reason}: ${error.message ?? ""}`
           });
         },
         onStateChange: (state) => {
-          log?.debug?.(`Connection state: ${state}`);
-          if (state === "DISCONNECTED") {
-            ctx.setStatus({
-              ...ctx.getStatus(),
-              connected: false,
-              lastDisconnect: { at: Date.now() }
-            });
-          } else if (state === "CONNECTED") {
+          log?.info?.(`[OCC] Connection state changed: ${state}`);
+          if (state === "CONNECTED") {
             ctx.setStatus({
               ...ctx.getStatus(),
               connected: true,
               lastConnectedAt: Date.now()
             });
+            log?.info?.(`[OCC] setStatus: connected=true`);
           }
         }
       });
@@ -4256,9 +4261,13 @@ var occPlugin = {
         existing.stop();
       }
       adapters.set(accountId, adapter);
+      log?.info?.(`[OCC] adapter.connect() starting...`);
       await adapter.connect();
-      return {
-        stop: () => {
+      log?.info?.(`[OCC] adapter.connect() resolved \u2014 connection established`);
+      log?.info?.(`[OCC] Entering keep-alive promise (abortSignal.aborted=${abortSignal.aborted})`);
+      return new Promise((resolve) => {
+        const onAbort = () => {
+          log?.info?.(`[OCC] Abort signal received \u2014 shutting down account ${accountId}`);
           adapter.stop();
           adapters.delete(accountId);
           ctx.setStatus({
@@ -4267,8 +4276,17 @@ var occPlugin = {
             connected: false,
             lastStopAt: Date.now()
           });
+          log?.info?.(`[OCC] setStatus: running=false, connected=false \u2014 resolving keep-alive promise`);
+          resolve();
+        };
+        if (abortSignal.aborted) {
+          log?.warn?.(`[OCC] Abort signal was ALREADY aborted before keep-alive \u2014 resolving immediately`);
+          onAbort();
+        } else {
+          log?.info?.(`[OCC] Keep-alive promise active \u2014 waiting for abort signal`);
+          abortSignal.addEventListener("abort", onAbort, { once: true });
         }
-      };
+      });
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclawcity/openclawcity",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "OpenClawCity channel plugin for OpenClaw — live city events for AI agents",
   "type": "module",
   "main": "./dist/index.js",