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

Jump to bottom

Optimize pack-manager for style&lint #15872

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Optimize pack-manager for style&lint #15872

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
735e8f4
Optimize pack-manager for style&lint
shrinktofit Aug 4, 2023
b0bfc0d
Fix
shrinktofit Aug 4, 2023
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
59 changes: 40 additions & 19 deletions cocos/asset/asset-manager/pack-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,22 @@
import { ImageAsset } from '../assets/image-asset';
import { Texture2D } from '../assets/texture-2d';
import { packCustomObjData, unpackJSONs } from '../../serialization/deserialize';
import { error, errorID, js } from '../../core';
import { assertIsTrue, error, errorID, js } from '../../core';
import Cache from './cache';
import downloader from './downloader';
import { transform } from './helper';
import RequestItem from './request-item';
import { files } from './shared';

export type Unpacker = (packUuid: string[], data: any, options: Record<string, any>, onComplete: ((err: Error | null, data?: any | null) => void)) => void;
export type Unpacker = (
packUuid: string[],
data: any,
options: Record<string, any>,
onComplete: ((err: Error | null, data?: any) => void),
) => void;
Comment on lines +35 to +40
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lint problem: too long line


interface IUnpackRequest {
onComplete: ((err: Error | null, data?: any | null) => void);
onComplete: ((err: Error | null, data?: any) => void);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lint problem: any | null is equivalent to any.

id: string;
}

Expand Down Expand Up @@ -73,12 +78,17 @@ export class PackManager {
* });
*
*/
public unpackJson (pack: string[], json: any, options: Record<string, any>, onComplete: ((err: Error | null, data?: Record<string, any> | null) => void)): void {
let out = js.createMap(true);
public unpackJson (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lint problem: too long line

pack: string[],
json: any,
options: Record<string, any>,
onComplete: ((err: Error | null, data?: Record<string, any> | null) => void),
): void {
const out: Record<string, any> = js.createMap(true);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem: untyped thing.

let err: Error | null = null;

if (Array.isArray(json)) {
json = unpackJSONs(json as any);
json = unpackJSONs(json as unknown as Parameters<typeof unpackJSONs>[0]);

if (json.length !== pack.length) {
errorID(4915);
Expand Down Expand Up @@ -107,7 +117,8 @@ export class PackManager {
}
} else {
err = new Error('unmatched type pack!');
out = null;
onComplete(err, null);
Copy link
Contributor Author

@shrinktofit shrinktofit Aug 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem: if don't do this, the out should be null | Record<...> which then causes many assertions in above.

return;
}
}
onComplete(err, out);
Expand Down Expand Up @@ -170,7 +181,13 @@ export class PackManager {
* });
*
*/
public unpack (pack: string[], data: any, type: string, options: Record<string, any>, onComplete: ((err: Error | null, data?: any | null) => void)): void {
public unpack (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lint problem: too long line

pack: string[],
data: any,
type: string,
options: Record<string, any>,
onComplete: ((err: Error | null, data?: any) => void),
): void {
if (!data) {
onComplete(new Error('package data is wrong!'));
return;
Expand Down Expand Up @@ -200,7 +217,7 @@ export class PackManager {
* packManager.load(requestItem, null, (err, data) => console.log(err));
*
*/
public load (item: RequestItem, options: Record<string, any> | null, onComplete: ((err: Error | null, data?: any | null) => void)): void {
public load (item: RequestItem, options: Record<string, any> | null, onComplete: ((err: Error | null, data?: any) => void)): void {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lint problem: any | null is equivalent to any.

// if not in any package, download as uausl
if (item.isNative || !item.info || !item.info.packs) {
downloader.download(item.id, item.url, item.ext, item.options, onComplete);
Expand All @@ -215,35 +232,39 @@ export class PackManager {
const packs = item.info.packs;

// find a loading package
let pack = packs.find((val): boolean => this._loading.has(val.uuid));
const loadingPack = packs.find((val): boolean => this._loading.has(val.uuid));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid below from pack! assertion.


if (pack) {
this._loading.get(pack.uuid)!.push({ onComplete, id: item.id });
if (loadingPack) {
const req = this._loading.get(loadingPack.uuid);
assertIsTrue(req);
req.push({ onComplete, id: item.id });
return;
}

// download a new package
pack = packs[0];
const pack = packs[0];
this._loading.add(pack.uuid, [{ onComplete, id: item.id }]);

// find the url of pack
const url = transform(pack.uuid, { ext: pack.ext, bundle: item.config!.name }) as string;
assertIsTrue(item.config);
const url = transform(pack.uuid, { ext: pack.ext, bundle: item.config.name }) as string;

downloader.download(pack.uuid, url, pack.ext, item.options, (err, data): void => {
files.remove(pack!.uuid);
files.remove(pack.uuid);
if (err) {
error(err.message, err.stack);
}
// unpack package
this.unpack(pack!.packedUuids, data, pack!.ext, item.options, (err2, result): void => {
this.unpack(pack.packedUuids, data, pack.ext, item.options, (err2, result): void => {
if (!err2) {
for (const id in result) {
files.add(id, result[id]);
}
}
const callbacks = this._loading.remove(pack!.uuid);
for (let i = 0, l = callbacks!.length; i < l; i++) {
const cb = callbacks![i];
const callbacks = this._loading.remove(pack.uuid);
assertIsTrue(callbacks);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer explicit assertion.

for (let i = 0, l = callbacks.length; i < l; i++) {
const cb = callbacks[i];
if (err || err2) {
cb.onComplete(err || err2);
continue;
Expand Down
Loading