Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed: webpack5 worker loader #379

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed: webpack5 worker loader #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/rath-client/src/dev/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { workerService } from '../services';
/* eslint import/no-webpack-loader-syntax:0 */
// @ts-ignore
// eslint-disable-next-line
import ExpandDateTimeWorker from './workers/dateTimeExpand.worker.js?worker';
// import ExpandDateTimeWorker from './workers/dateTimeExpand.worker.js?worker';
import { dateTimeExpand, doTest } from './workers/engine/dateTimeExpand';
import { checkExpandEnv } from './workers/engine/checkExpandEnv';

Expand All @@ -25,7 +25,7 @@ export async function expandDateTimeService(props: ExpandDateTimeProps): Promise
return res;
} else {
try {
const worker = new ExpandDateTimeWorker();
const worker = new Worker(new URL('./workers/dateTimeExpand.worker.js', import.meta.url));
const result = await workerService<ExpandDateTimeProps, ExpandDateTimeProps>(worker, props);
worker.terminate();
if (result.success) {
Expand Down
212 changes: 110 additions & 102 deletions packages/rath-client/src/latiao/program/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,127 +4,135 @@ import { workerService } from '../../services/base';
import { LaTiaoError } from './error';
import type { FieldToken, FieldType } from './token';
// @ts-ignore
import LTWorker from './program.worker?worker';
// import LTWorker from './program.worker?worker';

import type {
CreateLaTiaoProgramProps,
CreateLaTiaoProgramResult,
DestroyLaTiaoProgramProps,
ExecuteLaTiaoProgramProps,
ExecuteLaTiaoProgramResult,
ILaTiaoColumn,
Static,
CreateLaTiaoProgramProps,
CreateLaTiaoProgramResult,
DestroyLaTiaoProgramProps,
ExecuteLaTiaoProgramProps,
ExecuteLaTiaoProgramResult,
ILaTiaoColumn,
Static,
} from './types';


// @ts-ignore
const programWorker = new LTWorker() as Worker;
const programWorker = new Worker(new URL('./program.worker', import.meta.url)) as Worker;

export type Program = {
run: (source: string) => Promise<number>;
onError: (handler: (err: LaTiaoError) => void) => void;
destroy: () => void;
run: (source: string) => Promise<number>;
onError: (handler: (err: LaTiaoError) => void) => void;
destroy: () => void;
};

export const createProgram = (
data: Readonly<IRow[]>,
fields: Omit<FieldToken, 'type'>[],
load: (fields: Static<FieldToken[]>, data: Static<(number[] | string[])[]>) => void,
data: Readonly<IRow[]>,
fields: Omit<FieldToken, 'type'>[],
load: (fields: Static<FieldToken[]>, data: Static<(number[] | string[])[]>) => void
): Program => {
let programId: number | undefined = undefined;
let errHandler: (err: LaTiaoError) => void = err => {
throw err;
};
let programId: number | undefined = undefined;
let errHandler: (err: LaTiaoError) => void = (err) => {
throw err;
};

const program: Program = {
run: async source => {
if (programId === undefined) {
throw new Error('Program is not loaded yet.');
}
try {
const result = await workerService<ExecuteLaTiaoProgramResult, ExecuteLaTiaoProgramProps>(programWorker, {
task: 'execute',
programId,
source,
});
if (result.success) {
load(result.data.enter, result.data.columns);
return 0;
} else {
throw new LaTiaoError(result.message);
}
} catch (error) {
if (error instanceof LaTiaoError) {
errHandler(error);
return -1;
}
throw error;
}
},
onError: handler => {
errHandler = handler;
},
destroy: () => {
if (programId === undefined) {
throw new Error('Program is not loaded yet.');
}
workerService<unknown, DestroyLaTiaoProgramProps>(programWorker, {
task: 'destroyProgram',
programId,
});
},
};
const program: Program = {
run: async (source) => {
if (programId === undefined) {
throw new Error('Program is not loaded yet.');
}
try {
const result = await workerService<ExecuteLaTiaoProgramResult, ExecuteLaTiaoProgramProps>(programWorker, {
task: 'execute',
programId,
source,
});
if (result.success) {
load(result.data.enter, result.data.columns);
return 0;
} else {
throw new LaTiaoError(result.message);
}
} catch (error) {
if (error instanceof LaTiaoError) {
errHandler(error);
return -1;
}
throw error;
}
},
onError: (handler) => {
errHandler = handler;
},
destroy: () => {
if (programId === undefined) {
throw new Error('Program is not loaded yet.');
}
workerService<unknown, DestroyLaTiaoProgramProps>(programWorker, {
task: 'destroyProgram',
programId,
});
},
};

const columns: ILaTiaoColumn<FieldType>[] = [];
const columns: ILaTiaoColumn<FieldType>[] = [];

for (const f of fields) {
const header: CreateLaTiaoProgramProps['data'][number]['info'] = {
token: {
...f,
type: `RATH.FIELD::${f.mode}`,
},
};
const col = data.map(row => (f.mode === 'text' ? String : f.mode === 'bool' ? ((d: any) => d ? 1 : 0) : Number)(row[f.fid])) as number[] | string[] | (0 | 1)[];
columns.push({
info: header,
data: col,
});
}
for (const f of fields) {
const header: CreateLaTiaoProgramProps['data'][number]['info'] = {
token: {
...f,
type: `RATH.FIELD::${f.mode}`,
},
};
const col = data.map((row) => (f.mode === 'text' ? String : f.mode === 'bool' ? (d: any) => (d ? 1 : 0) : Number)(row[f.fid])) as
| number[]
| string[]
| (0 | 1)[];
columns.push({
info: header,
data: col,
});
}

try {
workerService<CreateLaTiaoProgramResult, CreateLaTiaoProgramProps>(programWorker, {
task: 'createProgram',
data: columns,
}).then(result => {
if (result.success) {
programId = result.data.programId;
} else {
throw new Error(result.message);
}
});
} catch (error) {
console.error(error);
}
try {
workerService<CreateLaTiaoProgramResult, CreateLaTiaoProgramProps>(programWorker, {
task: 'createProgram',
data: columns,
}).then((result) => {
if (result.success) {
programId = result.data.programId;
} else {
throw new Error(result.message);
}
});
} catch (error) {
console.error(error);
}

return program;
return program;
};

export const resolveFields = (tokens: Static<FieldToken[]>): IRawField[] => {
return tokens.map<IRawField>(token => ({
fid: token.fid,
name: token.name,
analyticType: token.extInfo?.extOpt === 'dateTimeExpand' ? 'dimension' : token.mode === 'vec' ? 'measure' : 'dimension',
semanticType: token.extInfo?.extOpt === 'dateTimeExpand' ? (
token.extInfo.extInfo === 'utime' ? 'temporal' : token.extInfo.extInfo === '$y' ? 'quantitative' : 'ordinal'
) : ({
bool: 'nominal',
vec: 'quantitative',
set: 'ordinal',
text: 'nominal',
} as const)[token.mode],
geoRole: 'none',
}));
return tokens.map<IRawField>((token) => ({
fid: token.fid,
name: token.name,
analyticType: token.extInfo?.extOpt === 'dateTimeExpand' ? 'dimension' : token.mode === 'vec' ? 'measure' : 'dimension',
semanticType:
token.extInfo?.extOpt === 'dateTimeExpand'
? token.extInfo.extInfo === 'utime'
? 'temporal'
: token.extInfo.extInfo === '$y'
? 'quantitative'
: 'ordinal'
: (
{
bool: 'nominal',
vec: 'quantitative',
set: 'ordinal',
text: 'nominal',
} as const
)[token.mode],
geoRole: 'none',
}));
};


export default createProgram;
24 changes: 13 additions & 11 deletions packages/rath-client/src/pages/causal/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@ import { workerService } from '../../services';
// eslint-disable-next-line
import CausalComputationWorker from './computation.worker.js?worker';

type ICausalProps = {
task: 'ig';
dataSource: readonly IRow[];
fields: readonly IFieldMeta[];
} | {
task: 'ig_cond';
dataSource: readonly IRow[];
fields: readonly IFieldMeta[];
matrix: readonly (readonly number[])[];
}
type ICausalProps =
| {
task: 'ig';
dataSource: readonly IRow[];
fields: readonly IFieldMeta[];
}
| {
task: 'ig_cond';
dataSource: readonly IRow[];
fields: readonly IFieldMeta[];
matrix: readonly (readonly number[])[];
};

export async function causalService(props: ICausalProps): Promise<number[][]> {
try {
const worker = new CausalComputationWorker();
const worker = new Worker(new URL('./computation.worker.js', import.meta.url));
const result = await workerService<number[][], ICausalProps>(worker, props);
worker.terminate();
if (result.success) {
Expand Down
Loading