@rpgjs/common 4.0.0-beta.10 → 4.0.0-beta.12

package/lib/AbstractObject.js

@@ -1,11 +1,11 @@
-import { intersection, generateUID, toRadians, isInstanceOf } from './Utils';
-import { Hit, HitType } from './Hit';
-import { RpgShape } from './Shape';
+import { intersection, generateUID, toRadians, isInstanceOf } from './Utils.js';
+import { Hit, HitType } from './Hit.js';
+import { RpgShape } from './Shape.js';
 import SAT from 'sat';
-import { RpgCommonMap } from './Map';
-import { RpgPlugin, HookServer } from './Plugin';
-import { GameSide } from './Game';
-import { Vector2d, Vector2dZero } from './Vector2d';
+import { RpgCommonMap } from './Map.js';
+import { RpgPlugin, HookServer } from './Plugin.js';
+import { GameSide } from './Game.js';
+import { Vector2d, Vector2dZero } from './Vector2d.js';
 import { Behavior, Direction, MoveClientMode, PlayerType } from '@rpgjs/types';
 import { from, map, mergeMap, Subject, tap, takeUntil } from 'rxjs';
 const ACTIONS = { IDLE: 0, RUN: 1, ACTION: 2 };

package/lib/Event.js

@@ -1,4 +1,4 @@
-import { RpgCommonPlayer } from './Player';
+import { RpgCommonPlayer } from './Player.js';
 export class RpgCommonEvent extends RpgCommonPlayer {
 }
 //# sourceMappingURL=Event.js.map

package/lib/EventEmitter.js

@@ -1,4 +1,4 @@
-import { isPromise } from './Utils';
+import { isPromise } from './Utils.js';
 export class EventEmitter {
     constructor() {
         this.listeners = {};

package/lib/Game.js

@@ -1,10 +1,10 @@
-import { generateUID, isClass } from './Utils';
-import { EventEmitter } from './EventEmitter';
-import { RpgCommonPlayer } from './Player';
+import { generateUID, isClass } from './Utils.js';
+import { EventEmitter } from './EventEmitter.js';
+import { RpgCommonPlayer } from './Player.js';
 import { Control, Direction } from '@rpgjs/types';
-import { RpgPlugin } from './Plugin';
-import { GameWorker } from './Worker';
-import { RpgShape } from './Shape';
+import { RpgPlugin } from './Plugin.js';
+import { GameWorker } from './Worker.js';
+import { RpgShape } from './Shape.js';
 export var GameSide;
 (function (GameSide) {
     GameSide["Server"] = "server";

package/lib/Hit.js

@@ -1,6 +1,6 @@
 import { HitType } from '@rpgjs/types';
 import SAT from 'sat';
-import { isInstanceOf } from './Utils';
+import { isInstanceOf } from './Utils.js';
 export { HitType } from '@rpgjs/types';
 class HitClass {
     createObjectHitbox(x, y, z, w, h) {

package/lib/Map.js

@@ -1,9 +1,9 @@
-import Utils, { random, generateUID } from './Utils';
-import { RpgShape } from './Shape';
-import { Hit } from './Hit';
-import { VirtualGrid } from './VirtualGrid';
+import Utils, { random, generateUID } from './Utils.js';
+import { RpgShape } from './Shape.js';
+import { Hit } from './Hit.js';
+import { VirtualGrid } from './VirtualGrid.js';
 import { MapClass } from '@rpgjs/tiled';
-import { AbstractObject } from './AbstractObject';
+import { AbstractObject } from './AbstractObject.js';
 import { map, Subject, takeUntil, mergeMap, from, filter } from 'rxjs';
 const buffer = new Map();
 const bufferClient = new Map();

package/lib/Module.js

@@ -1,6 +1,6 @@
-import { RpgPlugin, HookServer, HookClient } from './Plugin';
-import { isArray, isClass, isFunction, isPromise } from './Utils';
-import { warning } from './Logger';
+import { RpgPlugin, HookServer, HookClient } from './Plugin.js';
+import { isArray, isClass, isFunction, isPromise } from './Utils.js';
+import { warning } from './Logger.js';
 var Side;
 (function (Side) {
     Side["Server"] = "server";

package/lib/Player.js

@@ -1,4 +1,4 @@
-import { AbstractObject } from './AbstractObject';
+import { AbstractObject } from './AbstractObject.js';
 export const LiteralDirection = {
     1: 'up',
     2: 'right',

package/lib/Plugin.js

@@ -1,5 +1,5 @@
-import { EventEmitter } from './EventEmitter';
-import { isArray } from './Utils';
+import { EventEmitter } from './EventEmitter.js';
+import { isArray } from './Utils.js';
 export var HookServer;
 (function (HookServer) {
     HookServer["Start"] = "Server.Start";

package/lib/Scheduler.d.ts

@@ -10,6 +10,7 @@ export declare class Scheduler extends EventEmitter {
     private requestedDelay;
     private lastTimestamp;
     private _tick;
+    private _stop;
     get tick(): Observable<Tick>;
     nextTick(timestamp: number): void;
     /**
@@ -21,4 +22,5 @@ export declare class Scheduler extends EventEmitter {
         fps?: number;
         delay?: number;
     }): this;
+    stop(): void;
 }

package/lib/Scheduler.js

@@ -1,6 +1,6 @@
 import { BehaviorSubject } from 'rxjs';
-import { EventEmitter } from './EventEmitter';
-import Utils from './Utils';
+import { EventEmitter } from './EventEmitter.js';
+import Utils from './Utils.js';
 export class Scheduler extends EventEmitter {
     constructor() {
         super(...arguments);
@@ -16,6 +16,7 @@ export class Scheduler extends EventEmitter {
             frame: 0,
             deltaRatio: 0
         });
+        this._stop = false;
     }
     get tick() {
         return this._tick.asObservable();
@@ -67,6 +68,8 @@ export class Scheduler extends EventEmitter {
             let now = Utils.preciseNow();
             let then = Utils.preciseNow();
             const loop = (timestamp) => {
+                if (this._stop)
+                    return;
                 requestAnimationFrame(loop);
                 now = Utils.preciseNow();
                 const elapsed = now - then;
@@ -79,5 +82,9 @@ export class Scheduler extends EventEmitter {
         }
         return this;
     }
+    stop() {
+        this._stop = true;
+        this._tick.complete();
+    }
 }
 //# sourceMappingURL=Scheduler.js.map

package/lib/Scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"Scheduler.js","sourceRoot":"","sources":["../src/Scheduler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAc,MAAM,MAAM,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,MAAM,OAAO,SAAU,SAAQ,YAAY;IAA3C;;QAEY,QAAG,GAAW,EAAE,CAAA;QAChB,cAAS,GAAW,CAAC,CAAA;QACtB,UAAK,GAAW,CAAC,CAAA;QAChB,cAAS,GAAW,CAAC,CAAA;QACrB,mBAAc,GAAW,CAAC,CAAA;QAC1B,kBAAa,GAAW,CAAC,CAAA;QACzB,UAAK,GAA0B,IAAI,eAAe,CAAC;YACvD,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;YACZ,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,CAAC;SAChB,CAAC,CAAA;IAqEN,CAAC;IAnEG,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAA;IACpC,CAAC;IAED,QAAQ,CAAC,SAAiB;QACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,SAAS,CAAA,CAAC,QAAQ;QAClE,IAAI,CAAC,SAAS,GAAI,KAAK,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,CAAA;QACrD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACZ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;SAC1D,CAAC,CAAA;QACF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAA;QACnC,IAAI,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAIL;QACG,IAAI,OAAO,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAChD,IAAI,OAAO,CAAC,GAAG;YAAE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACvC,IAAI,OAAO,CAAC,KAAK;YAAE,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAA;QACtD,MAAM,qBAAqB,GAAG,CAAC,EAA+B,EAAE,EAAE;YAC9D,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;gBACnB,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;aAC9C;iBACI;gBACD,UAAU,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,cAAc,GAAG,CAAC,CAAA;oBACvB,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAA;gBAC1B,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAA;aACnD;QACL,CAAC,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,MAAM,IAAI,GAAG,CAAC,SAAiB,EAAE,EAAE;gBAC/B,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBAC3B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YAC5B,CAAC,CAAA;YACD,qBAAqB,CAAC,IAAI,CAAC,CAAA;SAC9B;aACI;YACD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC5C,IAAI,GAAG,GAAG,KAAK,CAAC,UAAU,EAAE,CAAA;YAC5B,IAAI,IAAI,GAAG,KAAK,CAAC,UAAU,EAAE,CAAA;YAC7B,MAAM,IAAI,GAAG,CAAC,SAAiB,EAAE,EAAE;gBAC/B,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBAC3B,GAAG,GAAG,KAAK,CAAC,UAAU,EAAE,CAAA;gBACxB,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,CAAA;gBAC1B,IAAI,OAAO,GAAG,UAAU,EAAE;oBACtB,IAAI,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,UAAU,CAAC,CAAA;oBACnC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;iBAC3B;YACL,CAAC,CAAA;YACD,qBAAqB,CAAC,IAAI,CAAC,CAAA;SAC9B;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
+{"version":3,"file":"Scheduler.js","sourceRoot":"","sources":["../src/Scheduler.ts"],"names":[],"mappings":"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"}

package/lib/Shape.js

@@ -1,7 +1,7 @@
-import { Hit, HitType } from './Hit';
+import { Hit, HitType } from './Hit.js';
 import { TiledObjectClass } from '@rpgjs/tiled';
 import { PlayerType } from '@rpgjs/types';
-import { Vector2d } from './Vector2d';
+import { Vector2d } from './Vector2d.js';
 export var ShapePositioning;
 (function (ShapePositioning) {
     ShapePositioning["Default"] = "default";

package/lib/index.js

@@ -1,25 +1,25 @@
-import AbstractObject from './Player';
-export { LiteralDirection, RpgCommonPlayer } from './Player';
+import AbstractObject from './Player.js';
+export { LiteralDirection, RpgCommonPlayer } from './Player.js';
 export { AbstractObject };
-export { RpgCommonEvent } from './Event';
-export { RpgCommonMap } from './Map';
-export { RpgCommonGame, GameSide } from './Game';
-export { EventEmitter } from './EventEmitter';
-export { PrebuiltGui } from './gui/PrebuiltGui';
-export * as Utils from './Utils';
-export { RpgPlugin, HookServer, HookClient } from './Plugin';
-export * as TransportIo from './transports/io';
+export { RpgCommonEvent } from './Event.js';
+export { RpgCommonMap } from './Map.js';
+export { RpgCommonGame, GameSide } from './Game.js';
+export { EventEmitter } from './EventEmitter.js';
+export { PrebuiltGui } from './gui/PrebuiltGui.js';
+export * as Utils from './Utils.js';
+export { RpgPlugin, HookServer, HookClient } from './Plugin.js';
+export * as TransportIo from './transports/io.js';
 export { Input, Control } from '@rpgjs/types';
-export { Hit } from './Hit';
-export { Scheduler } from './Scheduler';
-export { RpgModule, loadModules } from './Module';
-export * as MockIo from './transports/io';
-export * as Logger from './Logger';
-export { RpgShape, ShapePositioning } from './Shape';
-export { VirtualGrid } from './VirtualGrid';
-export { RpgCommonWorldMaps } from './WorldMaps';
-export { Vector2d } from './Vector2d';
+export { Hit } from './Hit.js';
+export { Scheduler } from './Scheduler.js';
+export { RpgModule, loadModules } from './Module.js';
+export * as MockIo from './transports/io.js';
+export * as Logger from './Logger.js';
+export { RpgShape, ShapePositioning } from './Shape.js';
+export { VirtualGrid } from './VirtualGrid.js';
+export { RpgCommonWorldMaps } from './WorldMaps.js';
+export { Vector2d } from './Vector2d.js';
 export { Direction } from '@rpgjs/types';
-export { transitionColor } from './Color';
-export { DefaultInput } from './DefaultInput';
+export { transitionColor } from './Color.js';
+export { DefaultInput } from './DefaultInput.js';
 //# sourceMappingURL=index.js.map

package/lib/workers/move.js

@@ -1,7 +1,7 @@
 import workerpool from 'workerpool';
-import { RpgCommonMap } from '../Map';
-import { RpgCommonGame, GameSide } from '../Game';
-import { RpgCommonPlayer } from '../Player';
+import { RpgCommonMap } from '../Map.js';
+import { RpgCommonGame, GameSide } from '../Game.js';
+import { RpgCommonPlayer } from '../Player.js';
 const objects = {};
 let objectsByMap = {};
 const gameEngine = new RpgCommonGame(GameSide.Worker);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/common",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "description": "",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -15,14 +15,14 @@
   "author": "Samuel Ronce",
   "license": "MIT",
   "dependencies": {
-    "@rpgjs/tiled": "^4.0.0-beta.10",
-    "@rpgjs/types": "^4.0.0-beta.10",
+    "@rpgjs/tiled": "^4.0.0-beta.12",
+    "@rpgjs/types": "^4.0.0-beta.12",
     "rbush": "^3.0.1",
     "rxjs": "^7.8.0",
     "sat": "^0.9.0",
     "workerpool": "^6.4.0"
   },
-  "gitHead": "3f2cc83f8738e0dd3503d3d3408a18bc2d8add71",
+  "gitHead": "674d63a05af4312416511893353b98ea5f4f14dd",
   "devDependencies": {
     "typescript": "^5.0.4"
   },

package/src/Scheduler.ts

@@ -17,6 +17,7 @@ export class Scheduler extends EventEmitter {
         frame: 0,
         deltaRatio: 0
     })
+    private _stop: boolean = false
 
     get tick(): Observable<Tick> {
         return this._tick.asObservable()
@@ -72,6 +73,7 @@ export class Scheduler extends EventEmitter {
             let now = Utils.preciseNow()
             let then = Utils.preciseNow()
             const loop = (timestamp: number) => {
+                if (this._stop) return
                 requestAnimationFrame(loop)
                 now = Utils.preciseNow()
                 const elapsed = now - then
@@ -85,4 +87,9 @@ export class Scheduler extends EventEmitter {
 
         return this;
     }
+
+    stop() {
+        this._stop = true
+        this._tick.complete()
+    }
 }