Compare commits
No commits in common. "caec48d0a63261398860d25a1c47462e5b2e64fb" and "c2ebdc00b9f7fd298a8f830bea324cdefbac485d" have entirely different histories.
caec48d0a6
...
c2ebdc00b9
|
@ -1 +1 @@
|
||||||
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAW,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAU,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AASlD,qBAAa,WAAY,SAAQ,MAAM;IACrC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,eAAe,CAAM;IAE7B,OAAO,CAAC,MAAM,CAAC,CAAgB;IAC/B,OAAO,CAAC,mBAAmB,CAAC,CAG1B;IAEF,OAAO,CAAC,OAAO,CAA0C;IACzD,OAAO,CAAC,QAAQ,CAAkD;IAElE,IAAI,GAAG;;MAON;gBAEW,aAAa,UAAO,EAAE,aAAa,UAAQ;IAcvD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEY,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiB5D,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAMd,OAAO;IA2BR,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQtE;AAQD,qBAAa,MAAO,SAAQ,MAAM;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAqC;IAEzD,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAa;gBAElB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW;IAM1C,OAAO,CAAC,gBAAgB,CAAC,CAAa;IAEtC,IAAI,eAAe,IAAI,UAAU,CAEhC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,IAAI,SAAS,IAAI,UAAU,CAE1B;IAEK,KAAK;YASG,SAAS;IAgEvB,EAAE,CAAC,CAAC,SAAS,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EACnD,KAAK,EAAE,CAAC,EACR,EAAE,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EAClD,OAAO,CAAC,EAAE,GAAG,GACZ,IAAI;IAiBP,GAAG,CAAC,CAAC,SAAS,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EACpD,KAAK,EAAE,CAAC,EACR,EAAE,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EACnD,OAAO,CAAC,EAAE,GAAG,EACb,IAAI,CAAC,EAAE,OAAO,GACb,IAAI;IASP,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAUX,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,UAAU;CAInB;AAID,eAAO,MAAM,YAAY,+BAA4C,CAAC"}
|
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAW,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAU,QAAQ,EAAY,MAAM,gBAAgB,CAAC;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AASlD,qBAAa,WAAY,SAAQ,MAAM;IACrC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,EAAE,CAAa;IACvB,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,eAAe,CAAM;IAE7B,OAAO,CAAC,MAAM,CAAC,CAAgB;IAC/B,OAAO,CAAC,mBAAmB,CAAC,CAG1B;IAEF,OAAO,CAAC,OAAO,CAA0C;IACzD,OAAO,CAAC,QAAQ,CAAkD;IAElE,IAAI,GAAG;;MAON;gBAEW,aAAa,UAAO,EAAE,aAAa,UAAQ;IAcvD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAEY,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiB5D,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAMd,OAAO;IA2BR,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI9B,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQtE;AAQD,qBAAa,MAAO,SAAQ,MAAM;IAChC,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAqC;IAEzD,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAa;gBAElB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW;IAM1C,OAAO,CAAC,gBAAgB,CAAC,CAAa;IAEtC,IAAI,eAAe,IAAI,UAAU,CAEhC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,IAAI,SAAS,IAAI,UAAU,CAE1B;IAEK,KAAK;YASG,SAAS;IA2DvB,EAAE,CAAC,CAAC,SAAS,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EACnD,KAAK,EAAE,CAAC,EACR,EAAE,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EAClD,OAAO,CAAC,EAAE,GAAG,GACZ,IAAI;IAiBP,GAAG,CAAC,CAAC,SAAS,YAAY,CAAC,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,EACpD,KAAK,EAAE,CAAC,EACR,EAAE,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,EACnD,OAAO,CAAC,EAAE,GAAG,EACb,IAAI,CAAC,EAAE,OAAO,GACb,IAAI;IASP,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAUX,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,UAAU;CAInB;AAID,eAAO,MAAM,YAAY,+BAA4C,CAAC"}
|
|
@ -137,13 +137,12 @@ export class Socket extends Client {
|
||||||
async _initSync() {
|
async _initSync() {
|
||||||
this.userData = null;
|
this.userData = null;
|
||||||
const mux = Protomux.from(this);
|
const mux = Protomux.from(this);
|
||||||
let updateSent = defer();
|
let updateDone = defer();
|
||||||
let updateReceived = defer();
|
|
||||||
const setup = defer();
|
const setup = defer();
|
||||||
const [update] = this.connectModule("syncProtomux", { id: this.id }, async (data) => {
|
const [update] = this.connectModule("syncProtomux", { id: this.id }, async (data) => {
|
||||||
if (data === true) {
|
if (data === true) {
|
||||||
updateSent.resolve();
|
updateDone.resolve();
|
||||||
updateSent = defer();
|
updateDone = defer();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await this.syncMutex.acquire();
|
await this.syncMutex.acquire();
|
||||||
|
@ -166,9 +165,9 @@ export class Socket extends Client {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
mux._free = mux._free.filter((item) => item !== undefined);
|
mux._free = mux._free.filter((item) => item !== undefined);
|
||||||
|
update(true);
|
||||||
this.syncMutex.release();
|
this.syncMutex.release();
|
||||||
setup.resolve();
|
setup.resolve();
|
||||||
updateReceived.resolve();
|
|
||||||
});
|
});
|
||||||
const send = async (mux) => {
|
const send = async (mux) => {
|
||||||
update({
|
update({
|
||||||
|
@ -176,9 +175,7 @@ export class Socket extends Client {
|
||||||
local: Object.keys(mux._local),
|
local: Object.keys(mux._local),
|
||||||
free: mux._free,
|
free: mux._free,
|
||||||
});
|
});
|
||||||
updateReceived = defer();
|
await updateDone.promise;
|
||||||
await updateSent.promise;
|
|
||||||
await updateReceived.promise;
|
|
||||||
};
|
};
|
||||||
mux.syncState = send.bind(undefined, mux);
|
mux.syncState = send.bind(undefined, mux);
|
||||||
await setup.promise;
|
await setup.promise;
|
||||||
|
|
15
src/index.ts
15
src/index.ts
|
@ -199,8 +199,7 @@ export class Socket extends Client {
|
||||||
this.userData = null;
|
this.userData = null;
|
||||||
const mux = Protomux.from(this);
|
const mux = Protomux.from(this);
|
||||||
|
|
||||||
let updateSent = defer();
|
let updateDone = defer();
|
||||||
let updateReceived = defer();
|
|
||||||
const setup = defer();
|
const setup = defer();
|
||||||
|
|
||||||
const [update] = this.connectModule(
|
const [update] = this.connectModule(
|
||||||
|
@ -208,8 +207,8 @@ export class Socket extends Client {
|
||||||
{ id: this.id },
|
{ id: this.id },
|
||||||
async (data: any) => {
|
async (data: any) => {
|
||||||
if (data === true) {
|
if (data === true) {
|
||||||
updateSent.resolve();
|
updateDone.resolve();
|
||||||
updateSent = defer();
|
updateDone = defer();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -235,10 +234,10 @@ export class Socket extends Client {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
mux._free = mux._free.filter((item: any) => item !== undefined);
|
mux._free = mux._free.filter((item: any) => item !== undefined);
|
||||||
|
update(true);
|
||||||
|
|
||||||
this.syncMutex.release();
|
this.syncMutex.release();
|
||||||
setup.resolve();
|
setup.resolve();
|
||||||
updateReceived.resolve();
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -248,11 +247,7 @@ export class Socket extends Client {
|
||||||
local: Object.keys(mux._local),
|
local: Object.keys(mux._local),
|
||||||
free: mux._free,
|
free: mux._free,
|
||||||
});
|
});
|
||||||
|
await updateDone.promise;
|
||||||
updateReceived = defer();
|
|
||||||
|
|
||||||
await updateSent.promise;
|
|
||||||
await updateReceived.promise;
|
|
||||||
};
|
};
|
||||||
mux.syncState = send.bind(undefined, mux);
|
mux.syncState = send.bind(undefined, mux);
|
||||||
await setup.promise;
|
await setup.promise;
|
||||||
|
|
Loading…
Reference in New Issue