@datalayer/core 0.0.4 → 0.0.6

package/lib/hooks/useParams.js

@@ -79,40 +79,6 @@ export const useParams = () => {
             window.removeEventListener('replacestate', updateSearchParams);
         };
     }, [isClient, paramsSource]);
-    // 4. For fallback, also try to parse route params from URL path
-    const fallbackRouteParams = useMemo(() => {
-        if (!isClient || paramsSource !== 'fallback')
-            return {};
-        const pathname = window.location.pathname;
-        const params = {};
-        // Common patterns to match
-        // /products/123 -> { id: '123' }
-        // /users/john-doe -> { username: 'john-doe' }
-        // /blog/2024/01/my-post -> { year: '2024', month: '01', slug: 'my-post' }
-        const patterns = [
-            { regex: /^\/products\/([^/]+)$/, params: ['id'] },
-            { regex: /^\/products\/([^/]+)\/reviews$/, params: ['id'] },
-            { regex: /^\/users\/([^/]+)$/, params: ['username'] },
-            {
-                regex: /^\/blog\/(\d{4})\/(\d{2})\/([^/]+)$/,
-                params: ['year', 'month', 'slug'],
-            },
-            { regex: /^\/posts\/([^/]+)$/, params: ['slug'] },
-            { regex: /^\/([^/]+)\/([^/]+)$/, params: ['category', 'id'] },
-        ];
-        for (const pattern of patterns) {
-            const match = pathname.match(pattern.regex);
-            if (match) {
-                pattern.params.forEach((paramName, index) => {
-                    if (match[index + 1]) {
-                        params[paramName] = match[index + 1];
-                    }
-                });
-                break;
-            }
-        }
-        return params;
-    }, [isClient, paramsSource, isClient ? window.location.pathname : '']);
     // Combine all params with proper memoization to prevent re-renders
     const combinedParams = useMemo(() => {
         const result = {};
@@ -133,19 +99,13 @@ export const useParams = () => {
                 result[key] = value;
             }
         }
-        // Add fallback route params
-        if (paramsSource === 'fallback') {
-            for (const [key, value] of Object.entries(fallbackRouteParams)) {
-                result[key] = value;
-            }
-        }
+        // Fallback route params are not supported without router configuration
         return result;
     }, [
         // Use JSON.stringify for deep comparison
         JSON.stringify(routeParams),
         JSON.stringify(queryParams),
         JSON.stringify(searchParams),
-        JSON.stringify(fallbackRouteParams),
         paramsSource,
     ]);
     return combinedParams;

package/lib/services/DatalayerServiceManager.d.ts

@@ -1,6 +1,6 @@
 import { ServiceManager } from '@jupyterlab/services';
 /**
- * Creates a ServiceManager configured for Datalayer's infrastructure
+ * Creates a ServiceManager configured for Datalayer.
  *
  * This function requests a new kernel from Datalayer's platform and
  * returns a configured ServiceManager that connects to the allocated

package/lib/services/DatalayerServiceManager.js

@@ -7,7 +7,7 @@ import { coreStore } from '../state/substates/CoreState';
 import { DEFAULT_DATALAYER_CONFIG } from '../config/Configuration';
 import { createRuntime } from '../api/runtimes/actions';
 /**
- * Creates a ServiceManager configured for Datalayer's infrastructure
+ * Creates a ServiceManager configured for Datalayer.
  *
  * This function requests a new kernel from Datalayer's platform and
  * returns a configured ServiceManager that connects to the allocated
@@ -52,16 +52,6 @@ export const createDatalayerServiceManager = async (environmentName, credits) =>
             appendToken: true,
         });
         const serviceManager = new ServiceManager({ serverSettings });
-        // Store runtime info on the serviceManager instance for access
-        serviceManager.__datalayerRuntime = {
-            environmentName: actualEnvironmentName,
-            credits: actualCredits,
-            reservationId: runtime.reservation_id,
-            podName: runtime.pod_name,
-            ingress: runtime.ingress,
-            token: runtime.token,
-            createdAt: new Date().toISOString(),
-        };
         console.log('Created Datalayer service manager:', {
             environmentName: actualEnvironmentName,
             credits: actualCredits,

package/lib/state/substates/CoreState.js

@@ -4,6 +4,7 @@
  */
 import { createStore } from 'zustand/vanilla';
 import { useStore } from 'zustand';
+import { configLogger } from '../../utils/logger';
 let loadConfigurationFromServer = true;
 let initialConfiguration = {
     runUrl: 'https://prod1.datalayer.run',
@@ -57,13 +58,13 @@ try {
                 ...initialConfiguration,
                 ...htmlOverridingConfiguration,
             };
-            console.log('Datalayer configuration loaded from HTML page', initialConfiguration);
+            configLogger.info('Datalayer configuration loaded from HTML page', initialConfiguration);
             window.document.title = `${initialConfiguration.brand.name} Ξ ${initialConfiguration.brand.about}`;
         }
     }
 }
 catch (error) {
-    console.debug('No valid configuration found in the webpage.', error);
+    configLogger.debug('No valid configuration found in the webpage.', error);
 }
 export const coreStore = createStore((set, get) => ({
     tab: 0.0,
@@ -71,7 +72,7 @@ export const coreStore = createStore((set, get) => ({
     setTab: (tab) => set((state) => ({ tab })),
     configuration: initialConfiguration,
     setConfiguration: (configuration) => {
-        console.log('Setting Datalayer configuration', configuration);
+        configLogger.debug('Setting Datalayer configuration', configuration);
         set(state => ({
             configuration: {
                 ...state.configuration,

package/lib/state/substates/IAMState.js

@@ -235,52 +235,49 @@ const creditsPoll = new Poll({
     standby: () => (iamStore.getState().user?.id ? 'when-hidden' : true),
 });
 // Initialize the IAM store with the stored token if it is valid.
-// Delay initialization slightly to allow apps to set up first
-setTimeout(() => {
-    iamStore
-        .getState()
-        .refreshUserByTokenStored()
-        .catch(reason => {
-        console.error('Failed to refresh to validate the stored token.', reason);
-    })
-        .finally(() => {
-        const { externalToken, iamRunUrl, checkIAMToken, token } = iamStore.getState();
-        // If the stored token is invalid and an external token exists, try authenticating with it.
-        if (!token && externalToken) {
-            console.debug('Can not login with token - Trying with the external token.');
-            requestDatalayerAPI({
-                url: `${iamRunUrl}/api/iam/v1/login`,
-                method: 'POST',
-                body: { token: externalToken },
-            })
-                .then(response => {
-                if (response.token) {
-                    checkIAMToken(response.token);
-                }
-            })
-                .catch(reason => {
-                console.debug('Can not login with token.', token, reason);
-            });
-        }
-        if (token) {
-            console.log('Logged in with token and external token.');
-        }
-        else {
-            console.debug('Failed to login with token and no external token available.');
-        }
-        // Start the credits poll in any case after trying to validate the user token.
-        creditsPoll.start();
-        // Force a refresh when the user comeback to the application tab
-        // Useful for checkout platform redirecting to another tab to add credits.
-        if (typeof document !== 'undefined') {
-            document.addEventListener('visibilitychange', () => {
-                if (!document.hidden && iamStore.getState().user?.id) {
-                    creditsPoll.refresh();
-                }
-            });
-        }
-    });
-}, 100); // 100ms delay to allow app initialization
+iamStore
+    .getState()
+    .refreshUserByTokenStored()
+    .catch(reason => {
+    console.error('Failed to refresh to validate the stored token.', reason);
+})
+    .finally(() => {
+    const { externalToken, iamRunUrl, checkIAMToken, token } = iamStore.getState();
+    // If the stored token is invalid and an external token exists, try authenticating with it.
+    if (!token && externalToken) {
+        console.debug('Can not login with token - Trying with the external token.');
+        requestDatalayerAPI({
+            url: `${iamRunUrl}/api/iam/v1/login`,
+            method: 'POST',
+            body: { token: externalToken },
+        })
+            .then(response => {
+            if (response.token) {
+                checkIAMToken(response.token);
+            }
+        })
+            .catch(reason => {
+            console.debug('Can not login with token.', token, reason);
+        });
+    }
+    if (token) {
+        console.log('Logged in with token and external token.');
+    }
+    else {
+        console.debug('Failed to login with token and no external token available.');
+    }
+    // Start the credits poll in any case after trying to validate the user token.
+    creditsPoll.start();
+    // Force a refresh when the user comeback to the application tab
+    // Useful for checkout platform redirecting to another tab to add credits.
+    if (typeof document !== 'undefined') {
+        document.addEventListener('visibilitychange', () => {
+            if (!document.hidden && iamStore.getState().user?.id) {
+                creditsPoll.refresh();
+            }
+        });
+    }
+});
 // Connect the core store with the iam store.
 coreStore.subscribe((state, prevState) => {
     if (state.configuration?.iamRunUrl &&

package/lib/state/substates/RuntimesState.js

@@ -53,7 +53,11 @@ export const runtimesStore = createStore((set, get) => {
          */
         addRuntimeModel: (model) => {
             const kernels = get().runtimeModels;
-            const index = kernels.findIndex(m => model.id === m.id) ?? -1;
+            // TODO
+            // We need to review the IRuntimeModel/IRuntimePod/Kernel.IModel and their id/uid handling.
+            // The id is the kernel id, which is no more always present for some reasons.
+            // So we need to also check the uid of the model.
+            const index = kernels.findIndex(m => (model.id === m.id || model.uid === m.uid) ?? -1);
             if (index < 0) {
                 set({ runtimeModels: [...kernels, model] });
             }

package/lib/theme/DatalayerThemeProvider.js

@@ -33,19 +33,14 @@ export function DatalayerThemeProvider(props) {
                     : 'light');
             }
             if (inJupyterLab) {
-                // TODO remove the try/catch for JupyterLab > 4.1.
-                try {
-                    const themeManager = jupyterLabAdapter?.service('@jupyterlab/apputils-extension:themes');
-                    if (themeManager) {
-                        updateColorMode(themeManager);
-                        themeManager.themeChanged.connect(updateColorMode);
-                        return () => {
-                            themeManager.themeChanged.disconnect(updateColorMode);
-                        };
-                    }
-                }
-                catch (e) {
-                    console.error('Error while setting the theme', e);
+                const themeManager = jupyterLabAdapter?.service('@jupyterlab/apputils-extension:themes');
+                console.log('---------DLA', inJupyterLab, jupyterLabAdapter, themeManager);
+                if (themeManager) {
+                    updateColorMode(themeManager);
+                    themeManager.themeChanged.connect(updateColorMode);
+                    return () => {
+                        themeManager.themeChanged.disconnect(updateColorMode);
+                    };
                 }
             }
             else {

package/lib/utils/logger.d.ts

@@ -0,0 +1,16 @@
+declare class Logger {
+    private scope;
+    private isDevelopment;
+    constructor(scope: string);
+    private log;
+    debug(message: string, ...args: any[]): void;
+    info(message: string, ...args: any[]): void;
+    warn(message: string, ...args: any[]): void;
+    error(message: string, ...args: any[]): void;
+}
+export declare function createLogger(scope: string): Logger;
+export declare const coreLogger: Logger;
+export declare const apiLogger: Logger;
+export declare const stateLogger: Logger;
+export declare const configLogger: Logger;
+export {};

package/lib/utils/logger.js

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023-2025 Datalayer, Inc.
+ * Distributed under the terms of the Modified BSD License.
+ */
+class Logger {
+    scope;
+    isDevelopment;
+    constructor(scope) {
+        this.scope = scope;
+        this.isDevelopment = process.env.NODE_ENV === 'development';
+    }
+    log(level, message, ...args) {
+        if (!this.isDevelopment && level === 'debug') {
+            return;
+        }
+        const timestamp = new Date().toISOString();
+        const prefix = `[${timestamp}] [${this.scope}] [${level.toUpperCase()}]`;
+        switch (level) {
+            case 'debug':
+                console.debug(prefix, message, ...args);
+                break;
+            case 'info':
+                console.info(prefix, message, ...args);
+                break;
+            case 'warn':
+                console.warn(prefix, message, ...args);
+                break;
+            case 'error':
+                console.error(prefix, message, ...args);
+                break;
+        }
+    }
+    debug(message, ...args) {
+        this.log('debug', message, ...args);
+    }
+    info(message, ...args) {
+        this.log('info', message, ...args);
+    }
+    warn(message, ...args) {
+        this.log('warn', message, ...args);
+    }
+    error(message, ...args) {
+        this.log('error', message, ...args);
+    }
+}
+export function createLogger(scope) {
+    return new Logger(scope);
+}
+export const coreLogger = createLogger('core');
+export const apiLogger = createLogger('api');
+export const stateLogger = createLogger('state');
+export const configLogger = createLogger('config');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/core",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "workspaces": [
     ".",
@@ -47,13 +47,20 @@
     "dev": "vite",
     "build": "gulp resources-to-lib && tsc -b && vite build",
     "build:lib": "gulp resources-to-lib && tsc -b",
-    "lint": "eslint . --quiet && npm run lint --workspace=nextjs-notebook-example",
-    "lint:fix": "eslint . --fix && npm run lint:fix --workspace=nextjs-notebook-example",
-    "format": "prettier --write \"{src,examples}/**/*.{js,jsx,ts,tsx,css,json,md,mjs}\" && npm run format --workspace=nextjs-notebook-example",
-    "format:check": "prettier --check \"{src,examples}/**/*.{js,jsx,ts,tsx,css,json,md,mjs}\" && npm run format:check --workspace=nextjs-notebook-example",
-    "type-check": "tsc --noEmit && npm run type-check --workspace=nextjs-notebook-example",
-    "check": "npm run format:check && npm run lint && npm run type-check",
-    "check:fix": "npm run format && npm run lint:fix && npm run type-check",
+    "build:nextjs": "npm run build --workspace=nextjs-notebook-example",
+    "build:electron": "npm run build --workspace=@datalayer/electron-example",
+    "build:examples": "npm run build:nextjs && npm run build:electron",
+    "build:all": "npm run build && npm run build:examples",
+    "lint": "eslint . --quiet",
+    "lint:fix": "eslint . --fix",
+    "lint:all": "npm run lint && npm run lint --workspaces --if-present",
+    "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,json,md}\" \"examples/**/*.{js,jsx,ts,tsx,css,json,md,mjs}\"",
+    "format:check": "prettier --check \"src/**/*.{js,jsx,ts,tsx,css,json,md}\" \"examples/**/*.{js,jsx,ts,tsx,css,json,md,mjs}\"",
+    "format:all": "npm run format && npm run format --workspaces --if-present",
+    "type-check": "tsc --noEmit",
+    "type-check:all": "npm run type-check && npm run type-check --workspaces --if-present",
+    "check": "npm run format:check && npm run lint:all && npm run type-check:all",
+    "check:fix": "npm run format:all && npm run lint:fix && npm run type-check:all",
     "preview": "vite preview",
     "start": "vite",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
@@ -70,6 +77,7 @@
     "watch:lib:src": "tsc -b -w",
     "example": "vite --config vite.examples.config.ts",
     "example:nextjs": "npm run dev --workspace=nextjs-notebook-example",
+    "example:electron": "cd examples/electron && npm run dev",
     "prepare": "husky"
   },
   "dependencies": {