Skip to content
Merged

. #15

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,837 changes: 3,039 additions & 2,798 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.46.1",
"@typescript-eslint/parser": "^8.46.1",
"@vitest/coverage-v8": "^4.1.0",
"@vitest/ui": "^4.1.0",
"@vitest/coverage-v8": "^4.0.14",
"@vitest/ui": "^4.0.14",
"chalk": "^4.1.0",
"clean-css": "^5.3.2",
"dotenv": "^16.4.5",
Expand All @@ -37,7 +37,7 @@
"typescript": "^5.4.5",
"uglify-js": "^3.17.4",
"vite-plugin-static-copy": "^3.3.0",
"vitest": "^4.1.0",
"vitest": "^4.0.14",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.1",
"yaml": "^2.8.1"
Expand Down Expand Up @@ -97,6 +97,8 @@
"uuid": "^9.0.1"
},
"optionalDependencies": {
"@emnapi/core": "^1.9.2",
"@emnapi/runtime": "^1.9.2",
"sharp": "^0.34.4",
"sharp-bmp": "^0.1.5",
"sharp-ico": "^0.1.5"
Expand Down
6 changes: 0 additions & 6 deletions src/backend/exports.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,11 @@
import CoreModule from './src/CoreModule.js';
import DatabaseModule from './src/DatabaseModule.js';
import { Kernel } from './src/Kernel.js';
import { PuterAIModule } from './src/modules/ai/PuterAIChatModule.js';
import { AppsModule } from './src/modules/apps/AppsModule.js';
import { BroadcastModule } from './src/modules/broadcast/BroadcastModule.js';
import { CaptchaModule } from './src/modules/captcha/CaptchaModule.js';
import { Core2Module } from './src/modules/core/Core2Module.js';
import { DataAccessModule } from './src/modules/data-access/DataAccessModule.js';
import { DNSModule } from './src/modules/dns/DNSModule.js';
import { DomainModule } from './src/modules/domain/DomainModule.js';
import { EntityStoreModule } from './src/modules/entitystore/EntityStoreModule.js';
import { HostOSModule } from './src/modules/hostos/HostOSModule.js';
import { InternetModule } from './src/modules/internet/InternetModule.js';
Expand Down Expand Up @@ -68,11 +65,8 @@ export default {
SelfHostedModule,
TestDriversModule,
TestConfigModule,
PuterAIModule,
BroadcastModule,
InternetModule,
CaptchaModule,
KVStoreModule,
DNSModule,
DomainModule,
};
1 change: 1 addition & 0 deletions src/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
"prompt-sync": "^4.2.0",
"proxyquire": "^2.1.3",
"recursive-readdir": "^2.2.3",
"replicate": "^1.4.0",
"response-time": "^2.3.2",
"seedrandom": "^3.0.5",
"sharp": "^0.34.3",
Expand Down
49 changes: 38 additions & 11 deletions src/backend/src/CoreModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ const { PuterS3Service } = require('./deprecated/filesystem/PuterS3Service');
*/
const install = async ({ context, services, app, useapi, modapi }) => {
const config = require('./config');
const registerServiceIfMissing = (name, service, options) => {
if ( services.has(name) ) return;
services.registerService(name, service, options);
};
const { TelemetryService } = require('./modules/perfmon/TelemetryService');
if ( ! services.has('telemetry') ) {
services.registerService('telemetry', TelemetryService);
Expand Down Expand Up @@ -315,21 +319,12 @@ const install = async ({ context, services, app, useapi, modapi }) => {
const { PermissionAPIService } = require('./services/PermissionAPIService');
services.registerService('__permission-api', PermissionAPIService);

const { AnomalyService } = require('./services/AnomalyService');
services.registerService('anomaly', AnomalyService);

const { HelloWorldService } = require('./services/HelloWorldService');
services.registerService('hello-world', HelloWorldService);

const { SystemDataService } = require('./services/SystemDataService');
services.registerService('system-data', SystemDataService);

const { SUService } = require('./services/SUService');
services.registerService('su', SUService);

const { ShutdownService } = require('./services/ShutdownService');
services.registerService('shutdown', ShutdownService);

const { BootScriptService } = require('./services/BootScriptService');
services.registerService('boot-script', BootScriptService);

Expand All @@ -356,8 +351,7 @@ const install = async ({ context, services, app, useapi, modapi }) => {

const { WispService } = require('./services/WispService');
services.registerService('wisp', WispService);
// const { AWSSecretsPopulator } = require('./services/AWSSecretsPopulator.js');
// services.registerService('awsthing', AWSSecretsPopulator);

const { WebDavFS } = require('./services/WebDAV/WebDAVService.js');
services.registerService('dav', WebDavFS);

Expand All @@ -382,6 +376,39 @@ const install = async ({ context, services, app, useapi, modapi }) => {
const { PeerService } = require('./services/PeerService');
services.registerService('peer', PeerService);

const { AIInterfaceService } = await import('./services/ai/AIInterfaceService.js');
const { AIChatService } = await import('./services/ai/chat/AIChatService.js');
const { AIImageGenerationService } = await import('./services/ai/image/AIImageGenerationService.js');
const { AIVideoGenerationService } = await import('./services/ai/video/AIVideoGenerationService.js');
registerServiceIfMissing('__ai-interfaces', AIInterfaceService);
registerServiceIfMissing('ai-chat', AIChatService);
registerServiceIfMissing('ai-image', AIImageGenerationService);
registerServiceIfMissing('ai-video', AIVideoGenerationService);

if ( config?.services?.['aws-textract']?.aws ) {
const { AWSTextractService } = await import('./services/ai/ocr/AWSTextractService.js');
registerServiceIfMissing('aws-textract', AWSTextractService);
}

if ( config?.services?.['aws-polly']?.aws ) {
const { AWSPollyService } = await import('./services/ai/tts/AWSPollyService.js');
registerServiceIfMissing('aws-polly', AWSPollyService);
}

if ( config?.services?.['elevenlabs'] || config?.elevenlabs ) {
const { ElevenLabsTTSService } = await import('./services/ai/tts/ElevenLabsTTSService.js');
const { ElevenLabsVoiceChangerService } = await import('./services/ai/sts/ElevenLabsVoiceChangerService.js');
registerServiceIfMissing('elevenlabs-tts', ElevenLabsTTSService);
registerServiceIfMissing('elevenlabs-voice-changer', ElevenLabsVoiceChangerService);
}

if ( config?.services?.openai || config?.openai ) {
const { OpenAITTSService } = await import('./services/ai/tts/OpenAITTSService.js');
const { OpenAISpeechToTextService } = await import('./services/ai/stt/OpenAISpeechToTextService.js');
registerServiceIfMissing('openai-tts', OpenAITTSService);
registerServiceIfMissing('openai-speech2txt', OpenAISpeechToTextService);
}

// === Services which are deprecated and should at most be maintained for legacy support ===
services.registerService('puter-s3', PuterS3Service);

Expand Down
6 changes: 3 additions & 3 deletions src/backend/src/Kernel.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const { ExtensionModule } = require('./ExtensionModule');
const { spawn } = require('node:child_process');
const fs = require('fs');
const path_ = require('path');
const { prependToJSFiles } = require('./kernel/modutil');
const { prependToJSFiles } = require('./util/modutil');
const { tmp_provide_services } = require('./helpers');
const uuid = require('uuid');
const readline = require('node:readline/promises');
Expand Down Expand Up @@ -255,9 +255,9 @@ class Kernel extends AdvancedBase {
for ( const mods_dirpath of mod_paths ) {
const p = (async () => {
if ( ! fs.existsSync(mods_dirpath) ) {
this.services.logger.error(`mod directory not found: ${quot(mods_dirpath)}; skipping...`);
console.error(`mod directory not found: ${quot(mods_dirpath)}; skipping...`);
// intentional delay so error is seen
this.services.logger.info('boot will continue in 4 seconds');
console.info('boot will continue in 4 seconds');
await new Promise(rslv => setTimeout(rslv, 4000));
return;
}
Expand Down
3 changes: 1 addition & 2 deletions src/backend/src/boot/RuntimeEnvironment.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
const { AdvancedBase } = require('@heyputer/putility');
const { quot } = require('@heyputer/putility').libs.string;
const { TechnicalError } = require('../errors/TechnicalError');
const { print_error_help } = require('../errors/error_help_details');
const default_config = require('./default_config');
const config = require('../config');
Expand Down Expand Up @@ -364,7 +363,7 @@ class RuntimeEnvironment extends AdvancedBase {
}

if ( meta.optional ) return;
throw new TechnicalError(`No suitable path found for ${meta.pathFor}.`);
throw new Error(`No suitable path found for ${meta.pathFor}.`);
}
}

Expand Down
8 changes: 7 additions & 1 deletion src/backend/src/clients/s3/s3ClientProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,14 @@ export const initializeS3Config = async (forceLocalInMem = false) => {
},
});

let s3Endpoint = fauxqsServer.address;
// WSL Quirk!
if ( s3Endpoint.includes('10.255.255.254') ) {
s3Endpoint = s3Endpoint.replace('10.255.255.254', '127.0.0.1');
}

awsClientConfig = {
endpoint: fauxqsServer.address,
endpoint: s3Endpoint,
credentials: {
accessKeyId: 'fakeAccessKeyId',
secretAccessKey: 'fakeSecretAccessKey',
Expand Down
43 changes: 0 additions & 43 deletions src/backend/src/entities/Group.js

This file was deleted.

45 changes: 0 additions & 45 deletions src/backend/src/errors/TechnicalError.js

This file was deleted.

41 changes: 0 additions & 41 deletions src/backend/src/middleware/featureflag.js

This file was deleted.

Loading
Loading