@appsemble/node-utils 0.37.5 → 0.38.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.37.5/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.38.0/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.37.5/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.37.5)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.38.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.38.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.37.5/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.38.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/authentication.d.ts

@@ -1,6 +1,14 @@
 export declare const CREDENTIALS_ENV_VAR = "APPSEMBLE_CLIENT_CREDENTIALS";
 export declare function getService(remote: string): string;
-export declare function getKeytar(): Promise<typeof import('keytar')>;
+export interface Keyring {
+    findCredentials: (service: string) => Promise<{
+        account: string;
+        password: string;
+    }[]>;
+    setPassword: (service: string, account: string, password: string) => Promise<void>;
+    deletePassword: (service: string, account: string) => Promise<void>;
+}
+export declare function getKeyring(): Promise<Keyring>;
 /**
  * Login to the server using OAuth2 client credentials.
  *

package/authentication.js

@@ -6,15 +6,24 @@ const authorizedRemotes = new Set();
 export function getService(remote) {
     return `appsemble://${new URL(remote).host}`;
 }
-export async function getKeytar() {
+async function importKeyring() {
     try {
-        const { default: keytar } = await import('keytar');
-        return keytar;
+        return await import('@napi-rs/keyring');
     }
     catch {
-        throw new AppsembleError('Couldn’t find module keytar. Either install libsecret and reinstall @appsemble/cli, or pass --client-credentials on the command line.');
+        throw new AppsembleError('Couldn’t access the system keyring. Reinstall @appsemble/cli, or pass --client-credentials on the command line.');
     }
 }
+export async function getKeyring() {
+    const { AsyncEntry, findCredentialsAsync } = await importKeyring();
+    return {
+        findCredentials: (service) => findCredentialsAsync(service),
+        setPassword: (service, account, password) => new AsyncEntry(service, account).setPassword(password),
+        async deletePassword(service, account) {
+            await new AsyncEntry(service, account).deletePassword();
+        },
+    };
+}
 async function getClientCredentials(remote, inputCredentials) {
     if (inputCredentials) {
         return inputCredentials;
@@ -24,7 +33,7 @@ async function getClientCredentials(remote, inputCredentials) {
         logger.info(`Detected client credentials from ${CREDENTIALS_ENV_VAR} environment variable`);
         return envCredentials;
     }
-    const { findCredentials } = await getKeytar();
+    const { findCredentials } = await getKeyring();
     const choices = await findCredentials(getService(remote));
     if (choices.length === 0) {
         throw new AppsembleError(`No client credentials found. Register them using:\n\nappsemble login --remote ${remote}`);

package/icon.d.ts

@@ -1,5 +1,10 @@
 import { type Context } from 'koa';
-import { type RGBA } from 'sharp';
+interface RGBA {
+    alpha: number;
+    b: number;
+    g: number;
+    r: number;
+}
 interface ServeIconOptions {
     /**
      * If specified, fill the background with this color.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.37.5",
+  "version": "0.38.0",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,13 +40,14 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/lang-sdk": "0.37.5",
-    "@appsemble/types": "0.37.5",
-    "@appsemble/utils": "0.37.5",
+    "@appsemble/lang-sdk": "0.38.0",
+    "@appsemble/types": "0.38.0",
+    "@appsemble/utils": "0.38.0",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@inquirer/prompts": "^8.0.0",
     "@kubernetes/client-node": "1.4.0",
+    "@napi-rs/keyring": "^1.3.0",
     "@odata/parser": "^0.2.0",
     "@types/koa": "^2.0.0",
     "axios": "^1.0.0",
@@ -69,7 +70,6 @@
     "intl-messageformat": "^11.0.0",
     "ipaddr.js": "^2.4.0",
     "jsonschema": "~1.4.1",
-    "keytar": "^7.0.0",
     "koa": "^3.0.0",
     "koa-compose": "^4.0.0",
     "koa-mount": "^4.0.0",
@@ -83,7 +83,7 @@
     "lodash": "^4.0.0",
     "lodash-es": "^4.0.0",
     "logform": "^2.0.0",
-    "memfs": "4.57.8",
+    "memfs": "4.68.2",
     "mime-types": "^2.0.0",
     "minio": "^8.0.7",
     "mustache": "^4.0.0",
@@ -93,12 +93,12 @@
     "pg": "^8.16.3",
     "request-filtering-agent": "^3.2.0",
     "sass": "^1.0.0",
-    "sharp": "0.34.5",
+    "sharp": "0.35.3",
     "sort-keys": "^5.0.0",
     "strip-bom": "^5.0.0",
     "type-fest": "^4.0.0",
     "type-is": "^1.6.18",
-    "uuid": "^8.3.2",
+    "uuid": "^14.0.2",
     "webpack": "^5.0.0",
     "webpack-dev-middleware": "^6.0.0",
     "winston": "^3.0.0",
@@ -112,10 +112,9 @@
     "@types/koa-mount": "4.0.5",
     "@types/mustache": "4.2.6",
     "@types/type-is": "1.6.7",
-    "@types/uuid": "10.0.0",
     "axios-mock-adapter": "1.22.0",
-    "axios-test-instance": "7.0.0",
-    "vitest": "2.1.9"
+    "axios-test-instance": "8.0.0",
+    "vitest": "4.1.11"
   },
   "peerDependencies": {
     "prettier": "^3"