i18nexus-cli 3.6.1 → 3.7.0

package/README.md

@@ -315,9 +315,20 @@ A personal access token that you have generated in your i18nexus account (Can al
 i18nexus listen -k <PROJECT_API_KEY>
 ```
 
-This command starts a tunnel to your local development server using [localtunnel](https://www.npmjs.com/package/localtunnel), allowing i18nexus to send real-time webhooks for translation updates.
+This command opens a WebSocket connection from your local environment to the i18nexus servers to receive real-time updates whenever strings are added, updated, or deleted in your project.
 
-When a string is added, updated, or deleted in your project, a webhook is sent to your local server, automatically updating your local JSON files.
+When changes occur, your local JSON files are automatically refreshed to stay in sync.
+
+Many developers prefer to run this automatically alongside their development server. For example, in a Next.js project, you can do the following in your `package.json` using [concurrently](https://www.npmjs.com/package/concurrently):
+
+```json
+"scripts": {
+    "dev": "concurrently --raw \"next dev --turbo\" \"i18nexus listen\"",
+    "build": "i18nexus pull && next build",
+    "start": "i18nexus pull && next start",
+    "lint": "next lint"
+}
+```
 
 ### Options
 
@@ -325,14 +336,11 @@ When a string is added, updated, or deleted in your project, a webhook is sent t
 | ------------------- | --------- | ----------------------- |
 | `--api-key` or `-k` | &#10004;  |                         |
 | `--path` or `-p`    |           | See `pull` default path |
-| `--port`            |           | '3002'                  |
 
 ### Notes
 
 `--api-key`  
 Your project API key (Can also be set using environment variable `I18NEXUS_API_KEY`)
 
-`--port`  
-The local port your server will listen on to receive incoming webhook requests from i18nexus. Defaults to `3002`.
-
-The tunnel will remain active as long as the CLI is running. Press `Ctrl+C` to stop listening.
+`--path`
+The path to the destination folder in which translation files will be downloaded

package/bin/index.js

@@ -268,11 +268,9 @@ program
     '-p, --path <path>',
     'The path to the destination folder in which translation files will be downloaded'
   )
-  .option('--port <port>', 'Port your local dev server runs on', '3002')
   .action(options => {
     listen({
       apiKey: options.apiKey,
-      port: options.port,
       path: options.path
     });
   });

package/commands/listen.js

@@ -1,28 +1,16 @@
 #!/usr/bin/env node
-/* commands/listen.js */
-
-const http = require('http');
-const localtunnel = require('localtunnel');
+const WebSocket = require('ws');
 const colors = require('colors');
-const handleFetch = require('../handleFetch');
-const baseUrl = require('../baseUrl');
 const pull = require('../commands/pull');
+const baseUrl = require('../baseUrl');
+const { URL } = require('url');
 
-const LISTEN_PATH = '/webhook'; // fixed internal path
-
-const listen = async ({ apiKey, port, path }) => {
-  port = Number(port);
-
-  if (!Number.isInteger(port) || port <= 0) {
-    console.log(colors.red('Invalid port'));
-    return process.exit(1);
-  }
-
+const listen = async ({ apiKey, path }) => {
   await pull(
     {
       apiKey,
       version: 'latest',
-      path: path,
+      path,
       clean: false,
       confirmed: false
     },
@@ -32,22 +20,37 @@ const listen = async ({ apiKey, port, path }) => {
     }
   );
 
-  /* ────────────── 1. start local HTTP listener ────────────── */
-  const server = http.createServer(async (req, res) => {
-    if (req.method !== 'POST' || req.url !== LISTEN_PATH) {
-      res.writeHead(404).end();
-      return;
+  const wsUrl = new URL(`${baseUrl.replace(/^http/, 'ws')}/cable`);
+  wsUrl.searchParams.set('api_key', apiKey);
+
+  const ws = new WebSocket(wsUrl.toString(), {
+    headers: {
+      Origin: 'http://cli.i18nexus.com'
     }
+  });
+
+  ws.on('open', () => {
+    console.log(colors.green('Listening for i18nexus string updates...'));
 
-    let body = '';
-    req.on('data', chunk => (body += chunk));
-    req.on('end', async () => {
-      try {
+    ws.send(
+      JSON.stringify({
+        command: 'subscribe',
+        identifier: JSON.stringify({ channel: 'CliListenChannel' })
+      })
+    );
+  });
+
+  ws.on('message', async message => {
+    try {
+      const data = JSON.parse(message);
+      const payload = data.message;
+
+      if (payload?.event === 'strings.changed') {
         await pull(
           {
             apiKey,
             version: 'latest',
-            path: path,
+            path,
             clean: false,
             confirmed: false
           },
@@ -56,81 +59,28 @@ const listen = async ({ apiKey, port, path }) => {
             successLog: '  ✔ Translations updated'
           }
         );
-
-        res.writeHead(200).end('ok');
-      } catch (e) {
-        console.error(colors.red('Failed to download translations:'), e);
-        res.writeHead(500).end('error');
       }
-    });
+    } catch (e) {
+      console.error(colors.red('i18nexus Sync Failed'));
+    }
   });
 
-  /* ────────────── 2. start tunnel ────────────── */
-  const tunnel = await new Promise(res => {
-    server.listen(port, async () => {
-      res(await localtunnel({ port }));
-    });
+  ws.on('close', () => {
+    process.exit(1);
   });
 
-  const publicUrl = `${tunnel.url}${LISTEN_PATH}`;
-
-  /* ────────────── 3. register dev webhook with i18nexus ────────────── */
-  const createRes = await handleFetch(
-    `${baseUrl}/project_resources/dev_webhooks`,
-    {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ api_key: apiKey, url: publicUrl })
-    }
-  );
-
-  let closing = false;
-
-  /* ────────────── graceful shutdown ────────────── */
-  const cleanUp = async (exitCode = 0) => {
-    if (closing) {
-      return;
-    }
-
-    closing = true;
-
-    try {
-      const { collection } = await createRes.json();
-      const webhookId = collection[0].id;
+  ws.on('error', err => {
+    console.error(colors.red('i18nexus Connection Error'));
+    process.exit(1);
+  });
 
-      await handleFetch(`${baseUrl}/project_resources/dev_webhooks`, {
-        method: 'DELETE',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ api_key: apiKey, id: webhookId })
-      });
-    } catch (e) {}
-    tunnel.close();
-    server.close();
-    process.exit(exitCode);
+  const cleanUp = () => {
+    ws.close();
+    process.exit(0);
   };
 
-  if (createRes.status !== 200) {
-    console.log(colors.red('Failed to register webhook with i18nexus'));
-    cleanUp(1);
-    return;
-  }
-
-  console.log(colors.green('Listening for i18nexus updates…'));
-
-  process.on('SIGINT', () => cleanUp());
-  process.on('SIGTERM', () => cleanUp());
-
-  let connectionLost = false;
-  tunnel.on('error', () => {
-    if (connectionLost) {
-      return;
-    }
-    connectionLost = true;
-
-    console.error(colors.red('i18nexus listener connection lost'));
-
-    cleanUp(1);
-  });
+  process.on('SIGINT', cleanUp);
+  process.on('SIGTERM', cleanUp);
 };
 
 module.exports = listen;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18nexus-cli",
-  "version": "3.6.1",
+  "version": "3.7.0",
   "description": "Command line interface (CLI) for accessing the i18nexus API",
   "main": "index.js",
   "bin": {
@@ -20,7 +20,7 @@
     "colors": "^1.4.0",
     "commander": "^7.2.0",
     "https-proxy-agent": "^5.0.0",
-    "localtunnel": "^2.0.2",
-    "node-fetch": "^2.6.7"
+    "node-fetch": "^2.6.7",
+    "ws": "^8.18.3"
   }
 }