@drayman/core 1.4.0 → 1.5.0

package/dist/component-processor.js

@@ -216,6 +216,9 @@ const initializeComponentInstance = async ({ componentInstanceId, browserCommand
         // const delta = jsondiff.diff(previouslySerializedTree, result.tree);
         // const delta = compare(previouslySerializedTree, result.tree);
         sendMessage({ type: 'view', payload: { view: result.tree, updateId } });
+        if (updateId === 1 && ComponentInstance.onInit) {
+            await ComponentInstance.onInit();
+        }
         // previouslySerializedTree = { ...result.tree };
         // previouslySerializedTree = JSON.parse(JSON.stringify(result.tree));
         // process?.send?.({ type: 'view', payload: { view: serializedView } });

package/dist/index.d.ts

@@ -43,7 +43,7 @@ export declare const onInitializeComponentInstance: ({ namespaceId, extensionsPa
 }) => Promise<void>;
 export declare const onDisconnect: ({ connectionId }: {
     connectionId: any;
-}) => void;
+}) => Promise<void>;
 export declare const onDestroyComponentInstance: ({ componentInstanceId }: {
     componentInstanceId: any;
 }) => Promise<void>;

package/dist/index.js

@@ -93,61 +93,66 @@ const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPat
         connectionId,
         namespaceId,
     };
-    if (toTerminate[componentInstanceId]) {
-        exports.componentInstances[componentInstanceId].terminate();
-        delete toTerminate[componentInstanceId];
-    }
-    else {
-        worker.events().subscribe(({ type, payload }) => {
-            /**
-             * When there is a response to user event request.
-             */
-            if (type === 'response') {
-                const { requestId, result, err } = payload;
-                if (err) {
-                    exports.componentInstances[componentInstanceId].eventRequests[requestId].onError({ err });
-                }
-                else {
-                    exports.componentInstances[componentInstanceId].eventRequests[requestId].onSuccess({ result });
-                }
-                delete exports.componentInstances[componentInstanceId].eventRequests[requestId];
-            }
-            else if (type === 'eventHubEvent') {
-                const { eventPayload, groupId, type } = payload;
-                exports.handleEventHubEvent({ data: eventPayload, groupId, type, namespaceId });
-            }
-            else if (type === 'console') {
-                const { text } = payload;
-                onComponentInstanceConsole?.({ text });
+    worker.events().subscribe(({ type, payload }) => {
+        /**
+         * When there is a response to user event request.
+         */
+        if (type === 'response') {
+            const { requestId, result, err } = payload;
+            if (err) {
+                exports.componentInstances[componentInstanceId].eventRequests[requestId].onError({ err });
             }
             else {
-                emit({ type, payload, componentInstanceId });
+                exports.componentInstances[componentInstanceId].eventRequests[requestId].onSuccess({ result });
             }
-        });
-        worker.initializeComponentInstance({ browserCommands, componentNamePrefix, componentName, componentRootDir, componentOptions, componentInstanceId, extensionsPath, extensionsOptions });
-    }
+            delete exports.componentInstances[componentInstanceId].eventRequests[requestId];
+        }
+        else if (type === 'eventHubEvent') {
+            const { eventPayload, groupId, type } = payload;
+            exports.handleEventHubEvent({ data: eventPayload, groupId, type, namespaceId });
+        }
+        else if (type === 'console') {
+            const { text } = payload;
+            onComponentInstanceConsole?.({ text });
+        }
+        else {
+            emit({ type, payload, componentInstanceId });
+        }
+    });
+    worker.initializeComponentInstance({ browserCommands, componentNamePrefix, componentName, componentRootDir, componentOptions, componentInstanceId, extensionsPath, extensionsOptions });
+    await clearGarbage();
 };
 exports.onInitializeComponentInstance = onInitializeComponentInstance;
-const onDisconnect = ({ connectionId }) => {
-    for (const componentInstanceId of Object.keys(exports.componentInstances).filter(x => exports.componentInstances[x].connectionId === connectionId)) {
-        exports.onDestroyComponentInstance({ componentInstanceId });
-    }
+const onDisconnect = async ({ connectionId }) => {
+    garbage.connections.push(connectionId);
+    await clearGarbage();
 };
 exports.onDisconnect = onDisconnect;
-const toTerminate = {};
+const garbage = {
+    connections: [],
+    componentInstances: [],
+};
 const onDestroyComponentInstance = async ({ componentInstanceId }) => {
-    if (!exports.componentInstances[componentInstanceId]) {
-        toTerminate[componentInstanceId] = true;
-    }
-    else {
-        try {
-            await exports.componentInstances[componentInstanceId].worker.handleDestroyComponentInstance();
-        }
-        catch (err) {
-            console.warn(err);
-        }
-        exports.componentInstances[componentInstanceId].terminate();
-    }
+    garbage.componentInstances.push(componentInstanceId);
+    await clearGarbage();
 };
 exports.onDestroyComponentInstance = onDestroyComponentInstance;
 exports.componentInstances = {};
+const clearGarbage = async () => {
+    const aliveComponentInstances = Object.keys(exports.componentInstances);
+    const garbageComponentInstanceIds = [
+        ...aliveComponentInstances.filter(x => garbage.connections.includes(exports.componentInstances[x].connectionId)),
+        ...garbage.componentInstances,
+    ];
+    for (const componentInstanceId of garbageComponentInstanceIds) {
+        if (exports.componentInstances[componentInstanceId]) {
+            try {
+                await exports.componentInstances[componentInstanceId].worker.handleDestroyComponentInstance();
+            }
+            catch (err) {
+                console.warn(err);
+            }
+            exports.componentInstances[componentInstanceId].terminate();
+        }
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drayman/core",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "@babel/preset-env": "^7.13.15",
     "@babel/preset-react": "^7.13.13",
     "@babel/preset-typescript": "^7.13.0",
-    "@drayman/types": "^1.4.0",
+    "@drayman/types": "^1.5.0",
     "@types/jest": "^26.0.22",
     "@types/node": "^14.14.39",
     "babel-jest": "^26.6.3",
@@ -39,5 +39,5 @@
     "ts-node": "^9.1.1",
     "typescript": "~4.1.5"
   },
-  "gitHead": "9b2f7bbdc9d949a0baeaa8b1a7622251080a2309"
+  "gitHead": "072618ea36a1d151c16e5233c502ad737eec5785"
 }