fix: don't load bench.js files (#2207)

* fix: autoloader grabbing bench.js files

* fix: errors failing

* fix: extension cache typ

* cache: app icons

Author: Salazareo

extensions/api.d.ts

@@ -14,6 +14,7 @@ import type { RequestHandler } from 'express';
 import type FSNodeContext from '../src/backend/src/filesystem/FSNodeContext.js';
 import type helpers from '../src/backend/src/helpers.js';
 import type * as ExtensionControllerExports from './ExtensionController/src/ExtensionController.ts';
+import kvjs from '@heyputer/kv.js';
 declare global {
     namespace Express {
         interface Request {
@@ -96,7 +97,7 @@ interface Extension extends RouterMethods {
     on(event: 'create.drivers', listener: (event: { createDriver: (interface: string, service: string, executors: any) => any }) => void),
     on(event: 'create.permissions', listener: (event: { grant_to_everyone: (permission: string) => void, grant_to_users: (permission: string) => void }) => void)
     on(event: 'create.interfaces', listener: (event: { createInterface: (interface: string, interfaces: DriverInterface) => void }) => void)
-    import(module: 'data'): { db: BaseDatabaseAccessService, kv: DynamoKVStore, cache: unknown } // TODO DS: type cache better
+    import(module: 'data'): { db: BaseDatabaseAccessService, kv: DynamoKVStore, cache: kvjs }
     import(module: 'core'): CoreRuntimeModule,
     import(module: 'fs'): FilesystemModule,
     import(module: 'query'): typeof query,

package-lock.json

@@ -516,12 +516,13 @@ class Kernel extends AdvancedBase {
                 const fullpath = path_.join(mod_path, directory);
                 const fsitems = fs.readdirSync(fullpath);
                 for ( const item of fsitems ) {
-                    if ( ! item.endsWith('.js') ) {
+                    if ( !item.endsWith('.js') && !item.endsWith('.cjs') && !item.endsWith('.mjs') ) {
                         continue;
                     }
-                    if ( item.endsWith('.test.js') ) {
+                    if ( item.endsWith('.test.js') || item.endsWith('.bench.js') ) {
                         continue;
                     }
+
                     const stat = fs.statSync(path_.join(fullpath, item));
                     if ( ! stat.isFile() ) {
                         continue;

src/backend/src/Kernel.js

@@ -79,6 +79,7 @@ class AppIconService extends BaseService {
                 } = await this.get_icon_stream({ app_uid, size });
 
                 res.set('Content-Type', mime);
+                res.set('Cache-Control', 'public, max-age=3600');
                 stream.pipe(res);
             },
         }).attach(app);

src/backend/src/modules/apps/AppIconService.js

@@ -30,7 +30,7 @@ def get_admin_password() -> str:
     """
     Get the admin password from the backend server, throw an error if not found.
     """
-    for attempt in range(90):  # wait up to 60 seconds (1 minute)
+    for attempt in range(120):  # wait up to 60 seconds (1 minute)
         time.sleep(1)
 
         # read the log file
@@ -43,7 +43,7 @@ def get_admin_password() -> str:
                 print(f"Extracted admin password: {admin_password}")
                 return admin_password
 
-    raise RuntimeError(f"no admin password found after 60 seconds, check {LOG_PATH} for details")
+    raise RuntimeError(f"no admin password found after 120 seconds")
 
 
 def get_token(admin_password: str) -> str: