goblin-desktop 4.2.0 → 4.2.2

package/contexts.js

@@ -1,13 +1,13 @@
-'use strict';
-
-/**
- * Retrieve the list of available commands.
- *
- * @returns {Object} The list and definitions of commands.
- */
-exports.xcraftCommands = function () {
-  return require(`./widgets/${require('path').basename(
-    __filename,
-    '.js'
-  )}/service.js`);
-};
+'use strict';
+
+/**
+ * Retrieve the list of available commands.
+ *
+ * @returns {Object} The list and definitions of commands.
+ */
+exports.xcraftCommands = function () {
+  return require(`./widgets/${require('path').basename(
+    __filename,
+    '.js'
+  )}/service.js`);
+};

package/desktop-manager.js

@@ -1,10 +1,10 @@
-'use strict';
-
-/**
- * Retrieve the list of available commands.
- *
- * @returns {Object} The list and definitions of commands.
- */
-exports.xcraftCommands = function () {
-  return require('./lib/service.js');
-};
+'use strict';
+
+/**
+ * Retrieve the list of available commands.
+ *
+ * @returns {Object} The list and definitions of commands.
+ */
+exports.xcraftCommands = function () {
+  return require('./lib/service.js');
+};

package/desktop-window.js

@@ -1,13 +1,13 @@
-'use strict';
-
-/**
- * Retrieve the list of available commands.
- *
- * @returns {Object} The list and definitions of commands.
- */
-exports.xcraftCommands = function () {
-  return require(`./widgets/${require('path').basename(
-    __filename,
-    '.js'
-  )}/service.js`);
-};
+'use strict';
+
+/**
+ * Retrieve the list of available commands.
+ *
+ * @returns {Object} The list and definitions of commands.
+ */
+exports.xcraftCommands = function () {
+  return require(`./widgets/${require('path').basename(
+    __filename,
+    '.js'
+  )}/service.js`);
+};

package/desktop.js

@@ -1,13 +1,13 @@
-'use strict';
-
-/**
- * Retrieve the list of available commands.
- *
- * @returns {Object} The list and definitions of commands.
- */
-exports.xcraftCommands = function () {
-  return require(`./widgets/${require('path').basename(
-    __filename,
-    '.js'
-  )}/service.js`);
-};
+'use strict';
+
+/**
+ * Retrieve the list of available commands.
+ *
+ * @returns {Object} The list and definitions of commands.
+ */
+exports.xcraftCommands = function () {
+  return require(`./widgets/${require('path').basename(
+    __filename,
+    '.js'
+  )}/service.js`);
+};

package/eslint.config.js

@@ -1,65 +1,65 @@
-const js = require('@eslint/js');
-const globals = require('globals');
-const react = require('eslint-plugin-react');
-const jsdoc = require('eslint-plugin-jsdoc');
-const babel = require('@babel/eslint-plugin');
-const prettier = require('eslint-config-prettier');
-const babelParser = require('@babel/eslint-parser');
-
-module.exports = [
-  js.configs.recommended,
-  react.configs.flat.recommended,
-  jsdoc.configs['flat/recommended'],
-  prettier,
-  {
-    languageOptions: {
-      parser: babelParser,
-      parserOptions: {
-        requireConfigFile: false, // Évite de devoir spécifier un fichier de configuration Babel
-        babelOptions: {
-          presets: ['@babel/preset-react'],
-        },
-        ecmaFeatures: {
-          jsx: true,
-        },
-      },
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-        ...globals.es2022,
-        ...globals.mocha,
-      },
-    },
-    plugins: {
-      'react': react,
-      'jsdoc': jsdoc,
-      '@babel': babel,
-    },
-    rules: {
-      'eqeqeq': 'error',
-      'no-console': 'off',
-      'react/display-name': 'off',
-      '@babel/no-unused-expressions': 'error', // Utilisation de règles spécifiques à Babel
-      'no-unused-vars': [
-        'error',
-        {
-          vars: 'all',
-          args: 'none',
-          ignoreRestSiblings: true,
-          destructuredArrayIgnorePattern: '^_',
-        },
-      ],
-      'jsdoc/require-jsdoc': 'off',
-      'jsdoc/require-param-description': 'off',
-      'jsdoc/require-returns-description': 'off',
-    },
-    settings: {
-      react: {
-        version: 'detect',
-      },
-      jsdoc: {
-        mode: 'typescript',
-      },
-    },
-  },
-];
+const js = require('@eslint/js');
+const globals = require('globals');
+const react = require('eslint-plugin-react');
+const jsdoc = require('eslint-plugin-jsdoc');
+const babel = require('@babel/eslint-plugin');
+const prettier = require('eslint-config-prettier');
+const babelParser = require('@babel/eslint-parser');
+
+module.exports = [
+  js.configs.recommended,
+  react.configs.flat.recommended,
+  jsdoc.configs['flat/recommended'],
+  prettier,
+  {
+    languageOptions: {
+      parser: babelParser,
+      parserOptions: {
+        requireConfigFile: false, // Évite de devoir spécifier un fichier de configuration Babel
+        babelOptions: {
+          presets: ['@babel/preset-react'],
+        },
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.es2022,
+        ...globals.mocha,
+      },
+    },
+    plugins: {
+      'react': react,
+      'jsdoc': jsdoc,
+      '@babel': babel,
+    },
+    rules: {
+      'eqeqeq': 'error',
+      'no-console': 'off',
+      'react/display-name': 'off',
+      '@babel/no-unused-expressions': 'error', // Utilisation de règles spécifiques à Babel
+      'no-unused-vars': [
+        'error',
+        {
+          vars: 'all',
+          args: 'none',
+          ignoreRestSiblings: true,
+          destructuredArrayIgnorePattern: '^_',
+        },
+      ],
+      'jsdoc/require-jsdoc': 'off',
+      'jsdoc/require-param-description': 'off',
+      'jsdoc/require-returns-description': 'off',
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+      jsdoc: {
+        mode: 'typescript',
+      },
+    },
+  },
+];

package/lib/service.js

@@ -1,137 +1,137 @@
-'use strict';
-
-const path = require('path');
-const goblinName = path.basename(module.parent.filename, '.js');
-
-const T = require('goblin-nabu/widgets/helpers/t.js');
-const Goblin = require('xcraft-core-goblin');
-
-// Define initial logic values
-const logicState = {
-  id: goblinName,
-  serverTick: 0,
-};
-
-// Define logic handlers according rc.json
-const logicHandlers = {
-  tick: (state) => {
-    return state.set('serverTick', Date.now());
-  },
-};
-
-Goblin.registerQuest(goblinName, 'tick', function (quest) {
-  quest.do();
-});
-
-Goblin.registerQuest(goblinName, '_createDesktop', function* (
-  quest,
-  sessionDesktopId,
-  clientSessionId,
-  labId,
-  session,
-  username,
-  configuration,
-  mainGoblin
-) {
-  const desk = yield quest.createFor(
-    'desktop',
-    sessionDesktopId,
-    sessionDesktopId,
-    {
-      id: sessionDesktopId,
-      desktopId: sessionDesktopId,
-      clientSessionId,
-      labId,
-      session,
-      username,
-      configuration,
-      mainGoblin,
-    }
-  );
-
-  const exSession = quest.goblin.getX(`${sessionDesktopId}.session`);
-  if (!exSession) {
-    const mainGoblinAPI = quest.getAPI(mainGoblin);
-    if (mainGoblinAPI.configureNewDesktopSession) {
-      yield mainGoblinAPI.configureNewDesktopSession({
-        desktopId: sessionDesktopId,
-      });
-    }
-  } else {
-    yield desk.setLabId({labId});
-    yield desk.addNotification({
-      notificationId: `userconnected`,
-      color: 'green',
-      glyph: 'solid/eye',
-      message: T('{user} entre dans la session', '', {user: username}),
-    });
-  }
-
-  if (configuration && configuration.defaultContextId) {
-    yield desk.setNavToDefault({
-      defaultContextId: configuration.defaultContextId,
-    });
-  }
-});
-
-Goblin.registerQuest(goblinName, 'open', function* (
-  quest,
-  clientSessionId,
-  labId,
-  sessionDesktopId,
-  session,
-  username,
-  mainGoblin,
-  configuration,
-  next
-) {
-  const busClient = require('xcraft-core-busclient').getGlobal();
-
-  let serverTick = quest.goblin.getState().get('serverTick');
-  if (serverTick === 0) {
-    quest.dispatch('tick');
-    const serverTickInterval = setInterval(() => {
-      const resp = busClient.newResponse('desktop-manager', 'token');
-      resp.command.nestedSend('desktop-manager.tick');
-    }, 60000);
-    quest.goblin.defer(() => clearInterval(serverTickInterval));
-  }
-
-  quest.log.dbg(`${username} opening desktop...`);
-
-  /* CREATE A DESKTOP
-   * It uses the global busClient with a dedicated orcName in order to
-   * keep ARP entries for multicasting when the portal is going out.
-   * If we use the orcName provided by portal, then the entries are
-   * removed (linesIds too) when the socket is closed. It's necessary in
-   * the case of the desktop because the desktop is the session and the
-   * session can lives without portal.
-   */
-  const resp = busClient.newResponse('desktop-manager', 'token');
-  resp.msgContext = {_goblinUser: quest.user._goblinUser};
-  yield resp.command.send(
-    `desktop-manager._createDesktop`,
-    {
-      sessionDesktopId,
-      clientSessionId,
-      labId,
-      session,
-      username,
-      configuration,
-      mainGoblin,
-    },
-    next
-  );
-
-  quest.log.dbg(`${username} opening desktop...[DONE]`);
-  return {desktopId: sessionDesktopId};
-});
-
-Goblin.registerQuest(goblinName, 'close', function* (quest, sessionDesktopId) {
-  quest.evt(`${sessionDesktopId}.closed`); /* for laboratory cleaning */
-  yield quest.warehouse.unsubscribe({feed: sessionDesktopId});
-});
-
-module.exports = Goblin.configure(goblinName, logicState, logicHandlers);
-
-Goblin.createSingle(goblinName);
+'use strict';
+
+const path = require('path');
+const goblinName = path.basename(module.parent.filename, '.js');
+
+const T = require('goblin-nabu/widgets/helpers/t.js');
+const Goblin = require('xcraft-core-goblin');
+
+// Define initial logic values
+const logicState = {
+  id: goblinName,
+  serverTick: 0,
+};
+
+// Define logic handlers according rc.json
+const logicHandlers = {
+  tick: (state) => {
+    return state.set('serverTick', Date.now());
+  },
+};
+
+Goblin.registerQuest(goblinName, 'tick', function (quest) {
+  quest.do();
+});
+
+Goblin.registerQuest(goblinName, '_createDesktop', function* (
+  quest,
+  sessionDesktopId,
+  clientSessionId,
+  labId,
+  session,
+  username,
+  configuration,
+  mainGoblin
+) {
+  const desk = yield quest.createFor(
+    'desktop',
+    sessionDesktopId,
+    sessionDesktopId,
+    {
+      id: sessionDesktopId,
+      desktopId: sessionDesktopId,
+      clientSessionId,
+      labId,
+      session,
+      username,
+      configuration,
+      mainGoblin,
+    }
+  );
+
+  const exSession = quest.goblin.getX(`${sessionDesktopId}.session`);
+  if (!exSession) {
+    const mainGoblinAPI = quest.getAPI(mainGoblin);
+    if (mainGoblinAPI.configureNewDesktopSession) {
+      yield mainGoblinAPI.configureNewDesktopSession({
+        desktopId: sessionDesktopId,
+      });
+    }
+  } else {
+    yield desk.setLabId({labId});
+    yield desk.addNotification({
+      notificationId: `userconnected`,
+      color: 'green',
+      glyph: 'solid/eye',
+      message: T('{user} entre dans la session', '', {user: username}),
+    });
+  }
+
+  if (configuration && configuration.defaultContextId) {
+    yield desk.setNavToDefault({
+      defaultContextId: configuration.defaultContextId,
+    });
+  }
+});
+
+Goblin.registerQuest(goblinName, 'open', function* (
+  quest,
+  clientSessionId,
+  labId,
+  sessionDesktopId,
+  session,
+  username,
+  mainGoblin,
+  configuration,
+  next
+) {
+  const busClient = require('xcraft-core-busclient').getGlobal();
+
+  let serverTick = quest.goblin.getState().get('serverTick');
+  if (serverTick === 0) {
+    quest.dispatch('tick');
+    const serverTickInterval = setInterval(() => {
+      const resp = busClient.newResponse('desktop-manager', 'token');
+      resp.command.nestedSend('desktop-manager.tick');
+    }, 60000);
+    quest.goblin.defer(() => clearInterval(serverTickInterval));
+  }
+
+  quest.log.dbg(`${username} opening desktop...`);
+
+  /* CREATE A DESKTOP
+   * It uses the global busClient with a dedicated orcName in order to
+   * keep ARP entries for multicasting when the portal is going out.
+   * If we use the orcName provided by portal, then the entries are
+   * removed (linesIds too) when the socket is closed. It's necessary in
+   * the case of the desktop because the desktop is the session and the
+   * session can lives without portal.
+   */
+  const resp = busClient.newResponse('desktop-manager', 'token');
+  resp.msgContext = {_goblinUser: quest.user._goblinUser};
+  yield resp.command.send(
+    `desktop-manager._createDesktop`,
+    {
+      sessionDesktopId,
+      clientSessionId,
+      labId,
+      session,
+      username,
+      configuration,
+      mainGoblin,
+    },
+    next
+  );
+
+  quest.log.dbg(`${username} opening desktop...[DONE]`);
+  return {desktopId: sessionDesktopId};
+});
+
+Goblin.registerQuest(goblinName, 'close', function* (quest, sessionDesktopId) {
+  quest.evt(`${sessionDesktopId}.closed`); /* for laboratory cleaning */
+  yield quest.warehouse.unsubscribe({feed: sessionDesktopId});
+});
+
+module.exports = Goblin.configure(goblinName, logicState, logicHandlers);
+
+Goblin.createSingle(goblinName);

package/package.json

@@ -1,48 +1,48 @@
-{
-  "name": "goblin-desktop",
-  "version": "4.2.0",
-  "description": "Goblin Desktop",
-  "main": "./builders/builders.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Epsitec SA",
-  "contributors": [
-    "Samuel Loup <loup@epsitec.ch>",
-    "Mathieu Schroeter <schroeter@epsitec.ch>",
-    "Yannick Vessaz <vessaz@epsitec.ch>",
-    "Gillian Fries <fries@epsitec.ch>",
-    "Jonny Quarta <quarta@epsitec.ch>",
-    "Catia Guidi <guidi@epsitec.ch>",
-    "Pierre Arnaud <arnaud@epsitec.ch>",
-    "Michael Walz <walz@epsitec.ch>"
-  ],
-  "license": "MIT",
-  "config": {
-    "xcraft": {
-      "commands": true
-    }
-  },
-  "dependencies": {
-    "goblin-theme": "^2.0.0",
-    "immutable": "4.0.0-rc.14",
-    "uuid": "^8.3.2",
-    "xcraft-core-goblin": "^5.0.0",
-    "xcraft-core-log": "^2.2.0",
-    "xcraft-core-shredder": "^5.0.0",
-    "xcraft-core-utils": "^4.0.0"
-  },
-  "devDependencies": {
-    "goblin-laboratory": "^4.0.0",
-    "prettier": "2.0.4",
-    "prop-types": "^15.5.10",
-    "mousetrap": "^1.6.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "@fortawesome/react-fontawesome": "^0.1.9",
-    "scroll-into-view-if-needed": "^1.4.0",
-    "xcraft-dev-prettier": "^2.0.0",
-    "xcraft-dev-rules": "^4.4.2"
-  },
-  "prettier": "xcraft-dev-prettier"
-}
+{
+  "name": "goblin-desktop",
+  "version": "4.2.2",
+  "description": "Goblin Desktop",
+  "main": "./builders/builders.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Epsitec SA",
+  "contributors": [
+    "Samuel Loup <loup@epsitec.ch>",
+    "Mathieu Schroeter <schroeter@epsitec.ch>",
+    "Yannick Vessaz <vessaz@epsitec.ch>",
+    "Gillian Fries <fries@epsitec.ch>",
+    "Jonny Quarta <quarta@epsitec.ch>",
+    "Catia Guidi <guidi@epsitec.ch>",
+    "Pierre Arnaud <arnaud@epsitec.ch>",
+    "Michael Walz <walz@epsitec.ch>"
+  ],
+  "license": "MIT",
+  "config": {
+    "xcraft": {
+      "commands": true
+    }
+  },
+  "dependencies": {
+    "goblin-theme": "^2.0.0",
+    "immutable": "4.0.0-rc.14",
+    "uuid": "^8.3.2",
+    "xcraft-core-goblin": "^5.0.0",
+    "xcraft-core-log": "^2.2.0",
+    "xcraft-core-shredder": "^5.0.0",
+    "xcraft-core-utils": "^4.0.0"
+  },
+  "devDependencies": {
+    "goblin-laboratory": "^4.0.0",
+    "prettier": "2.0.4",
+    "prop-types": "^15.5.10",
+    "mousetrap": "^1.6.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "@fortawesome/react-fontawesome": "^0.1.9",
+    "scroll-into-view-if-needed": "^1.4.0",
+    "xcraft-dev-prettier": "^2.0.0",
+    "xcraft-dev-rules": "^4.4.2"
+  },
+  "prettier": "xcraft-dev-prettier"
+}

package/password-wizard.js

@@ -1,24 +1,24 @@
-'use strict';
-
-try {
-  require('goblin-workshop');
-
-  /**
-   * Retrieve the list of available commands.
-   *
-   * @returns {Object} The list and definitions of commands.
-   */
-  exports.xcraftCommands = function () {
-    return require(`./widgets/${require('path').basename(
-      __filename,
-      '.js'
-    )}/service.js`);
-  };
-} catch (ex) {
-  if (ex.code !== 'MODULE_NOT_FOUND') {
-    throw ex;
-  }
-  console.log(
-    `Skip ${__filename} initialization, goblin-workshop not available`
-  );
-}
+'use strict';
+
+try {
+  require('goblin-workshop');
+
+  /**
+   * Retrieve the list of available commands.
+   *
+   * @returns {Object} The list and definitions of commands.
+   */
+  exports.xcraftCommands = function () {
+    return require(`./widgets/${require('path').basename(
+      __filename,
+      '.js'
+    )}/service.js`);
+  };
+} catch (ex) {
+  if (ex.code !== 'MODULE_NOT_FOUND') {
+    throw ex;
+  }
+  console.log(
+    `Skip ${__filename} initialization, goblin-workshop not available`
+  );
+}