feat(logs): move Addon logs to API v4

Author: miton18

src/commands/logs.js

@@ -1,9 +1,8 @@
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
 import * as Application from '../models/application.js';
-import { resolveAddonId } from '../models/ids-resolver.js';
+import { resolveOwnerId, resolveRealId } from '../models/ids-resolver.js';
 import * as Log from '../models/log-v4.js';
-import * as LogV2 from '../models/log.js';
 import { Deferred } from '../models/utils.js';
 
 export async function appLogs(params) {
@@ -24,13 +23,18 @@ export async function appLogs(params) {
 
   // TODO: drop when addons are migrated to the v4 API
   if (addonIdOrRealId != null) {
-    const addonId = await resolveAddonId(addonIdOrRealId);
+    const addonId = await resolveRealId(addonIdOrRealId);
+    const ownerId = await resolveOwnerId(addonId);
     if (isForHuman) {
       Logger.println(styleText('blue', 'Waiting for addon logs…'));
     } else {
       throw new Error(`"${format}" format is not yet available for add-on logs`);
     }
-    return LogV2.displayLogs({ appAddonId: addonId, since, until, filter, deploymentId });
+
+    const deferred = new Deferred();
+    await Log.displayAddonLogs({ ownerId, addonId, since, until, filter, deploymentId, format, deferred });
+    return deferred.promise;
+    //return LogV2.displayLogs({ appAddonId: addonId, since, until, filter, deploymentId });
   }
 
   const { ownerId, appId } = await Application.resolveId(appIdOrName, alias);

src/models/log-v4.js

@@ -1,4 +1,5 @@
 import { ApplicationLogStream } from '@clevercloud/client/esm/streams/application-logs.js';
+import { ResourceLogStream } from '@clevercloud/client/esm/streams/resource-logs.js';
 import { styleText } from '../lib/style-text.js';
 import { Logger } from '../logger.js';
 import { conf } from './configuration.js';
@@ -91,6 +92,77 @@ export async function displayLogs(params) {
   return logStream;
 }
 
+export async function displayAddonLogs(params) {
+  const deferred = params.deferred || new Deferred();
+  const { apiHost, tokens } = await getHostAndTokens();
+  const { ownerId, addonId, filter, since, until, deploymentId, format } = params;
+
+  if (format === 'json' && until == null) {
+    throw new Error('"json" format is only applicable with a limiting parameter such as `--until`');
+  }
+
+  const logStream = new ResourceLogStream({
+    apiHost,
+    tokens,
+    ownerId,
+    addonId,
+    connectionTimeout: 10_000,
+    retryConfiguration,
+    since,
+    until,
+    deploymentId,
+    filter,
+    service: 'all',
+    throttleElements: THROTTLE_ELEMENTS,
+    throttlePerInMilliseconds: THROTTLE_PER_IN_MILLISECONDS,
+  });
+
+  // Properly close the stream
+  process.once('SIGINT', (signal) => logStream.close(signal));
+  const jsonArray = new JsonArray();
+
+  logStream
+    .on('open', () => {
+      Logger.debug(styleText('blue', `Logs stream (open) ${JSON.stringify({ addonId, filter, deploymentId })}`));
+      if (format === 'json') {
+        jsonArray.open();
+      }
+    })
+    .on('error', (event) => {
+      Logger.debug(styleText('red', `Logs stream (error) ${event.error.message}`));
+    })
+    .onLog((log) => {
+      switch (format) {
+        case 'json':
+          jsonArray.push(log);
+          return;
+        case 'json-stream':
+          Logger.printJson(log);
+          return;
+        case 'human':
+        default:
+          if (log.message === RESET_COLOR) {
+            return;
+          }
+          Logger.println(formatLogLine(log));
+      }
+    });
+
+  // start() is blocking until end of stream
+  logStream
+    .start()
+    .then(() => {
+      if (format === 'json') {
+        jsonArray.close();
+      }
+      return deferred.resolve();
+    })
+    .catch(processError)
+    .catch((error) => deferred.reject(error));
+
+  return logStream;
+}
+
 export async function watchDeploymentAndDisplayLogs(options) {
   const { ownerId, appId, deploymentId, commitId, knownDeployments, quiet, redeployDate, exitStrategy } = options;