fix: await sur l'écriture de la config setUrl + renommage des disposables

Co-authored-by: m.schnitzler <martin.wb.2015@gmail.com>

.drone.yml

@@ -1,6 +1,13 @@
 kind: pipeline
+type: ssh
 name: default
 
+server:
+    host: build.gextra.net
+    user: root
+    ssh_key:
+        from_secret: ssh_key_secret
+
 trigger:
     event:
         - tag
@@ -11,6 +18,7 @@ steps:
       commands:
           - npm install -g vsce
           - npm ci
+          - xvfb-run -a npm test
           - vsce package
 
     - name: gitea_release

.eslintrc.json

@@ -1,30 +0,0 @@
-{
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-        "@typescript-eslint/naming-convention": [
-            "warn",
-            {
-                "selector": "import",
-                "format": [ "camelCase", "PascalCase" ]
-            }
-        ],
-        "@typescript-eslint/semi": "warn",
-        "curly": "warn",
-        "eqeqeq": "warn",
-        "no-throw-literal": "warn",
-        "semi": "off"
-    },
-    "ignorePatterns": [
-        "out",
-        "dist",
-        "**/*.d.ts"
-    ]
-}

.gitignore

@@ -1,5 +1,4 @@
 out
-dist
 node_modules
 .vscode-test/
 *.vsix
@@ -31,3 +30,7 @@ coverage/
 .config/
 data/
 .aider*
+/dist/
+tsconfig.tsbuildinfo
+.twig-cs-fixer.cache
+testfront-screenshots/

.gitleaks.toml

@@ -0,0 +1,5 @@
+[extend]
+useDefault = true
+
+[allowlist]
+paths = ['''\.vscode-test/''']

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/commit-msg

@@ -0,0 +1,9 @@
+
+if [ -z "$(cat "$1" | grep -E '(^fix:)|(^feature:)|(^up$)|^Merge branch .+$')" ] ; then
+    echo ""
+    echo respecte le format de commit ❤
+    echo "  fix: xxx"
+    echo "  feature: xxx"
+    echo ""
+    exit 1
+fi

.husky/post-merge

@@ -0,0 +1,7 @@
+
+if git diff --name-only HEAD@{1} HEAD | grep package-lock.json ; then
+    echo "📦 package-lock.json changed. Running npm ci to update your dependencies..."
+    npm ci
+else
+    echo "📦 no need to update dependencies"
+fi

.husky/pre-commit

@@ -0,0 +1,13 @@
+
+# prevent commits on master
+branch="$(git rev-parse --abbrev-ref HEAD)"
+if [ "$branch" = "master" ]; then
+  echo ""
+  echo "You can't commit directly to master branch"
+  echo "please create a pull request"
+  echo ""
+  exit 1
+fi
+
+# run linters
+npx lint-staged

.lintstagedrc

@@ -0,0 +1,12 @@
+{
+    "*.js": ["eslint --fix", "prettier --write"],
+    "*.ts": ["eslint --fix", "prettier --write"],
+    "*.css": ["prettier --write"],
+    "*.jsx": ["prettier --write"],
+    "*.tsx": ["prettier --write"],
+    "*.php": ["php-cs-fixer fix --config .php-cs-fixer.php"],
+    "Dockerfile": ["hadolint --ignore DL3002 --ignore DL3003 --ignore DL3008 --ignore DL3013 --ignore DL3016 --ignore DL3022"],
+    "*.md": ["markdownlint --fix"],
+    "*openapi.json": ["spectral lint"],
+    "*.tf": ["tflint"]
+}

.npmrc

@@ -0,0 +1,3 @@
+min-release-age=1
+fund=false
+audit=false

.prettierignore

@@ -0,0 +1,10 @@
+web/*
+views/*
+log/*
+node_modules/*
+coverage/*
+data/*
+.vscode-test/
+/dist/
+tsconfig.tsbuildinfo
+legacy/*

.prettierrc.js

@@ -0,0 +1,7 @@
+export default {
+    tabWidth: 4,
+    singleQuote: true,
+    trailingComma: 'es5',
+    printWidth: 150,
+    arrowParens: 'always',
+};

README.md

@@ -5,14 +5,15 @@ collect stats about a user's activity in vscode
 ## Features
 
 it can track :
+
 - file opening
 - file saving
 - window focus
 
 ## Extension Settings
 
-* `vscodestat.setUrl`: function to set the remote server's url
-this will set the variable vscodestat.url
-* `vscodestat.callUrl`: funciton to test if it works
+- `vscodestat.setUrl`: function to set the remote server's url
+  this will set the variable vscodestat.url
+- `vscodestat.callUrl`: funciton to test if it works
 
 Sample url : https://xxxxxx/vscodestat?userName=raf

eslint.config.js

@@ -0,0 +1,68 @@
+import js from '@eslint/js';
+import tsparser from '@typescript-eslint/parser';
+import tsplugin from '@typescript-eslint/eslint-plugin';
+import globals from 'globals';
+
+export default [
+    // remonte (et --fix supprime) tout eslint-disable inutile : regle deja off, inactive, ou qui ne tire pas
+    { linterOptions: { reportUnusedDisableDirectives: 'error' } },
+    js.configs.recommended,
+    {
+        files: ['**/*.ts'],
+        languageOptions: {
+            parser: tsparser,
+            parserOptions: {
+                ecmaVersion: 6,
+                sourceType: 'module',
+            },
+            globals: {
+                ...globals.browser,
+                ...globals.node,
+                ...globals.mocha,
+            },
+        },
+        plugins: {
+            '@typescript-eslint': tsplugin,
+        },
+        rules: {
+            '@typescript-eslint/naming-convention': [
+                'warn',
+                {
+                    selector: 'import',
+                    format: ['camelCase', 'PascalCase'],
+                },
+            ],
+            curly: 'warn',
+            eqeqeq: 'warn',
+            'no-throw-literal': 'warn',
+            semi: 'off',
+            // Règles générales réutilisées de flatbay
+            'prefer-const': ['error', { destructuring: 'all' }],
+            'no-var': 'error',
+            'object-shorthand': ['error', 'properties'],
+            'prefer-template': 'error',
+            'dot-notation': 'error',
+            'no-unused-expressions': 'error',
+            'no-nested-ternary': 'error',
+            'one-var-declaration-per-line': ['error', 'always'],
+            'one-var': ['error', 'never'],
+            'vars-on-top': 'error',
+            yoda: 'error',
+            'prefer-arrow-callback': 'error',
+            'no-implicit-globals': 'error',
+            'no-labels': 'error',
+            'no-new-func': 'error',
+            'no-script-url': 'error',
+            'no-sequences': 'error',
+            'no-unused-labels': 'error',
+            'prefer-spread': 'error',
+            'no-console': 0, // Garder les console.log pour debug
+            'no-empty': 0,
+            'no-redeclare': 0,
+            'no-useless-escape': 0,
+        },
+    },
+    {
+        ignores: ['legacy/', 'out/', 'dist/', '.vscode-test/', '**/*.d.ts'],
+    },
+];

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vscodestat",
     "displayName": "vscodestat",
-    "version": "1.1.87",
+    "version": "1.8.8",
     "description": "",
     "categories": [
         "Other"
@@ -12,10 +12,12 @@
     },
     "license": "ISC",
     "author": "Raphael Piccolo",
+    "type": "module",
     "main": "./out/extension.js",
     "scripts": {
         "compile": "tsc -p ./",
         "lint": "eslint src --ext ts",
+        "prepare": "husky",
         "pretest": "npm run compile && npm run lint",
         "test": "vscode-test",
         "vscode:prepublish": "npm run compile",
@@ -23,10 +25,6 @@
     },
     "contributes": {
         "commands": [
-            {
-                "command": "vscodestat.helloWorld",
-                "title": "Hello World"
-            },
             {
                 "command": "vscodestat.setUrl",
                 "title": "setUrl"
@@ -51,18 +49,24 @@
         "onStartupFinished"
     ],
     "devDependencies": {
+        "@eslint/js": "^10.0.1",
         "@types/mocha": "^10.0.10",
-        "@types/node": "22.x",
-        "@types/vscode": "^1.100.0",
-        "@typescript-eslint/eslint-plugin": "^8.32.0",
-        "@typescript-eslint/parser": "^8.32.0",
-        "@vscode/test-cli": "^0.0.10",
-        "@vscode/test-electron": "^2.5.2",
-        "eslint": "^9.26.0",
-        "typescript": "^5.8.3"
+        "@types/node": "26.x",
+        "@types/vscode": "^1.125.0",
+        "@typescript-eslint/eslint-plugin": "^8.65.0",
+        "@typescript-eslint/parser": "^8.65.0",
+        "@vscode/test-cli": "^0.0.15",
+        "@vscode/test-electron": "^3.1.0",
+        "eslint": "^10.1.0",
+        "globals": "^17.8.0",
+        "husky": "^9.1.7",
+        "lint-staged": "^17.2.0",
+        "prettier": "^3.9.6",
+        "ts-api-utils": "^2.5.0",
+        "typescript": "^6.0.3"
     },
     "engines": {
-        "vscode": "^1.100.0"
+        "vscode": "^1.125.0"
     },
     "icon": "icon.png",
     "extensionKind": [

src/extension.ts

@@ -3,78 +3,72 @@ import * as vscode from 'vscode';
 export function activate(context: vscode.ExtensionContext) {
     console.log('Congratulations, your extension "vscodestat" is now active!');
 
-    // crée une commande de test
-    let disposable = vscode.commands.registerCommand('vscodestat.helloWorld', () => {
-        vscode.window.showInformationMessage('Hello World from vscodestat!');
-    });
-    context.subscriptions.push(disposable);
-
     // commande pour definir l'url
-    let disposable2 = vscode.commands.registerCommand('vscodestat.setUrl', async () => {
+    const setUrlCommand = vscode.commands.registerCommand('vscodestat.setUrl', async () => {
         const url = await vscode.window.showInputBox({
             prompt: 'Enter the URL:',
-            placeHolder: ''
+            placeHolder: '',
         });
 
         if (url) {
-            vscode.workspace.getConfiguration().update('vscodestat.url', url, vscode.ConfigurationTarget.Global);
+            await vscode.workspace.getConfiguration().update('vscodestat.url', url, vscode.ConfigurationTarget.Global);
             vscode.window.showInformationMessage('URL set successfully.');
         }
     });
-    context.subscriptions.push(disposable2);
+    context.subscriptions.push(setUrlCommand);
 
     // commande pour tester l'url
-    let disposable3 = vscode.commands.registerCommand('vscodestat.callUrl', async () => {
+    const callUrlCommand = vscode.commands.registerCommand('vscodestat.callUrl', async () => {
         const storedUrl = vscode.workspace.getConfiguration().get('vscodestat.url') as string;
         if (!storedUrl) {
             vscode.window.showWarningMessage('URL is not set. Please set the URL first.');
             return;
         }
-        await makeHttpRequest({ event: 'ping'});
+        await makeHttpRequest({ event: 'ping' });
         vscode.window.showInformationMessage('callUrl done');
     });
-    context.subscriptions.push(disposable3);
+    context.subscriptions.push(callUrlCommand);
 
     // detecte une ouverture de fichier / nouvel onglet
-    vscode.window.onDidChangeActiveTextEditor(async editor => {
+    vscode.window.onDidChangeActiveTextEditor(async (editor) => {
         if (editor) {
             const filePath = editor.document.fileName;
             console.log('Opened file:', filePath);
 
             // vscode.window.showInformationMessage(`Opened file: ${filePath}`);
-            await makeHttpRequest({ event: 'open', project: extractProjectName(filePath) });
+            await makeHttpRequest({ event: 'open', project: extractProjectName(filePath), source: 'vscode' });
         }
     });
 
     // detecte une sauvegarde de fichier
-    vscode.workspace.onDidSaveTextDocument(async document => {
+    vscode.workspace.onDidSaveTextDocument(async (document) => {
         const filePath = document.fileName;
         console.log('Saved file:', filePath);
 
         // vscode.window.showInformationMessage(`Saved file: ${filePath}`);
-        await makeHttpRequest({ event: 'save', project: extractProjectName(filePath) });
+        await makeHttpRequest({ event: 'save', project: extractProjectName(filePath), source: 'vscode' });
     });
 
     // detecte un focus / blur de la fenetre vscode
-    vscode.window.onDidChangeWindowState(async event => {
+    vscode.window.onDidChangeWindowState(async (event) => {
         console.log('Window state changed:', event.focused);
-        await makeHttpRequest({ focus: event.focused });
+        await makeHttpRequest({ event: 'focus', focused: event.focused });
     });
 }
 
-export function deactivate() { }
+export function deactivate() {}
 
 /*
-* extractProjectName will extract a project name from a path
-* /root/docker/monitoringserver/controller/homeController.js
-* => monitoringserver
-*/
-function extractProjectName(path: string) {
+ * extractProjectName will extract a project name from a path
+ * /root/docker/monitoringserver/controller/homeController.js
+ * => monitoringserver
+ */
+export function extractProjectName(path: string) {
     // des c'est l'un des fois l'autre ?
     // /root/docker/vscodestat/src/extension.ts
     // \root\docker\vscodestat\src\extension.ts
     path = path.replace(/\\/g, '/');
-    
+
     const match = path.match(/\/docker\/([^/]+)/);
     if (match) {
         return match[1];
@@ -84,8 +78,8 @@ function extractProjectName(path: string) {
 }
 
 /*
-* fonction qui envoie un event au serveur
-*/
+ * fonction qui envoie un event au serveur
+ */
 async function makeHttpRequest(json: Object) {
     try {
         const url = vscode.workspace.getConfiguration().get('vscodestat.url') as string;
@@ -97,16 +91,16 @@ async function makeHttpRequest(json: Object) {
         const rawResponse = await fetch(url, {
             method: 'POST',
             headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
             },
-            body: JSON.stringify(json)
+            body: JSON.stringify(json),
         });
         const content = await rawResponse.json();
 
         console.log(content);
         // vscode.window.showInformationMessage('HTTP request successful.');
-    } catch (error:any) {
+    } catch (error: any) {
         console.error('Error making HTTP request:', error);
         // vscode.window.showErrorMessage('Error making HTTP request: ' + error.message);
     }

src/test/extension.test.ts

@@ -1,15 +1,28 @@
 import * as assert from 'assert';
+import { extractProjectName } from '../extension.js';
 
-// You can import and use all API from the 'vscode' module
-// as well as import your extension to test it
-import * as vscode from 'vscode';
-// import * as myExtension from '../../extension';
+suite('extractProjectName', () => {
+    test('extrait le nom de projet depuis un path Linux /root/docker/X', () => {
+        assert.strictEqual(extractProjectName('/root/docker/vscodestat/src/extension.ts'), 'vscodestat');
+    });
 
-suite('Extension Test Suite', () => {
-	vscode.window.showInformationMessage('Start all tests.');
+    test('extrait le nom de projet depuis un path Windows \\root\\docker\\X', () => {
+        assert.strictEqual(extractProjectName('C:\\root\\docker\\monitoringserver\\controller\\homeController.js'), 'monitoringserver');
+    });
 
-	test('Sample test', () => {
-		assert.strictEqual(-1, [1, 2, 3].indexOf(5));
-		assert.strictEqual(-1, [1, 2, 3].indexOf(0));
-	});
+    test('retourne null pour un path hors /docker/', () => {
+        assert.strictEqual(extractProjectName('/home/user/projet/file.js'), null);
+    });
+
+    test('retourne null pour un path vide', () => {
+        assert.strictEqual(extractProjectName(''), null);
+    });
+
+    test('extrait correctement quand le chemin contient docker plusieurs fois', () => {
+        assert.strictEqual(extractProjectName('/root/docker/flatbay/lib/docker/foo.js'), 'flatbay');
+    });
+
+    test('gere les paths avec tirets et chiffres', () => {
+        assert.strictEqual(extractProjectName('/root/docker/gextra6/bin/console'), 'gextra6');
+    });
 });

tsconfig.json

@@ -1,17 +1,12 @@
 {
-	"compilerOptions": {
-		"module": "Node16",
-		"target": "ES2022",
-		"outDir": "out",
-		"lib": [
-			"ES2022"
-		],
-		"sourceMap": true,
-		"rootDir": "src",
-		"strict": true   /* enable all strict type-checking options */
-		/* Additional Checks */
-		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
-		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
-		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-	}
+    "compilerOptions": {
+        "module": "Node16",
+        "target": "ES2022",
+        "outDir": "out",
+        "lib": ["ES2022"],
+        "types": ["node", "mocha", "vscode"],
+        "sourceMap": true,
+        "rootDir": "src",
+        "strict": true
+    }
 }