From 41df3995d282c31b3ffeaf364fd9d665b313545a Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:04:17 +0000 Subject: [PATCH 01/51] Initial commit --- deep-packages/insertHandler.cjs | 47 ++++ deep-packages/insertNotificationHandler.cjs | 85 +++++++ deep-packages/sleep.cjs | 3 + logger.cjs | 251 ++++++++++++++++++++ 4 files changed, 386 insertions(+) create mode 100644 deep-packages/insertHandler.cjs create mode 100644 deep-packages/insertNotificationHandler.cjs create mode 100644 deep-packages/sleep.cjs create mode 100644 logger.cjs diff --git a/deep-packages/insertHandler.cjs b/deep-packages/insertHandler.cjs new file mode 100644 index 00000000..649dc7c2 --- /dev/null +++ b/deep-packages/insertHandler.cjs @@ -0,0 +1,47 @@ +const insertHandler = async ({deep,fileTypeId, fileName, handlerName, handleName, triggerTypeId, code, supportsId, handleOperationTypeId, containTypeId, packageId, handlerTypeId, code}) => { + return await deep.insert({ + type_id: fileTypeId, + in: { + data: [ + { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: fileName } }, + }, + { + from_id: supportsId, + type_id: handlerTypeId, + in: { + data: [ + { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: handlerName } }, + }, + { + type_id: handleOperationTypeId, + from_id: triggerTypeId, + in: { + data: [ + { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: handleName } }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + string: { + data: { + value: code, + }, + }, + }); + }; + + exports.insertHandler = insertHandler; \ No newline at end of file diff --git a/deep-packages/insertNotificationHandler.cjs b/deep-packages/insertNotificationHandler.cjs new file mode 100644 index 00000000..6ab1941e --- /dev/null +++ b/deep-packages/insertNotificationHandler.cjs @@ -0,0 +1,85 @@ +const insertNotificationHandler = async ({deep, notificationPort, notificationRoute, portTypeId, routerListeningTypeId, routerTypeId, routerStringUseTypeId, routeTypeId, handleRouteTypeId, handlerTypeId, supportsId, containTypeId, adminId, fileTypeId, handlerName, code}) => { +return await deep.insert( + { + type_id: portTypeId, + number: { + data: { value: notificationPort }, + }, + in: { + data: { + type_id: routerListeningTypeId, + from: { + data: { + type_id: routerTypeId, + in: { + data: { + type_id: routerStringUseTypeId, + string: { + data: { + value: + notificationRoute, + }, + }, + from: { + data: { + type_id: routeTypeId, + out: { + data: { + type_id: handleRouteTypeId, + to: { + data: { + type_id: handlerTypeId, + from_id: supportsId, + in: { + data: { + type_id: containTypeId, + // from_id: deep.linkId, + from_id: adminId, + string: { + data: { + value: handlerName, + }, + }, + }, + }, + to: { + data: { + type_id: fileTypeId, + string: { + data: { + value: code, + }, + }, + in: { + data: { + type_id: containTypeId, + from_id: packageId, + string: { + data: { + value: handlerName, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, + { + name: 'INSERT_HANDLE_ROUTE_HIERARCHICAL', + } + ) +} + +exports.insertNotificationHandler = insertNotificationHandler; \ No newline at end of file diff --git a/deep-packages/sleep.cjs b/deep-packages/sleep.cjs new file mode 100644 index 00000000..2f580a86 --- /dev/null +++ b/deep-packages/sleep.cjs @@ -0,0 +1,3 @@ +const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); + +exports.sleep = sleep; \ No newline at end of file diff --git a/logger.cjs b/logger.cjs new file mode 100644 index 00000000..fd388efc --- /dev/null +++ b/logger.cjs @@ -0,0 +1,251 @@ +require('react'); +require('graphql'); +require('lodash'); +require('subscriptions-transport-ws'); +const dotenv = require('dotenv'); +const dotenvExpand = require('dotenv-expand'); +const { generateApolloClient } = require('@deep-foundation/hasura/client'); +const { DeepClient } = require('@deep-foundation/deeplinks/imports/client'); +const { + minilinks, + Link, +} = require('@deep-foundation/deeplinks/imports/minilinks'); +const puppeteer = require('puppeteer'); +const crypto = require('crypto'); +const axios = require('axios'); +const uniqid = require('uniqid'); +const { expect } = require('chai'); +const { get } = require('lodash'); +const { + default: links, +} = require('@deep-foundation/deeplinks/imports/router/links'); +const { + insertHandler, +} = require('@deep-foundation/deeplinks/imports/handlers'); + +var myEnv = dotenv.config(); +dotenvExpand.expand(myEnv); + +console.log('Installing payments-tinkoff-c2b package'); + +const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); + +const allCreatedLinkIds = []; + + + +const installPackage = async () => { + const apolloClient = generateApolloClient({ + path: process.env.NEXT_PUBLIC_GQL_PATH || '', // <<= HERE PATH TO UPDATE + ssl: !!~process.env.NEXT_PUBLIC_GQL_PATH.indexOf('localhost') + ? false + : true, + // admin token in prealpha deep secret key + // token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibGluayJdLCJ4LWhhc3VyYS1kZWZhdWx0LXJvbGUiOiJsaW5rIiwieC1oYXN1cmEtdXNlci1pZCI6IjI2MiJ9LCJpYXQiOjE2NTYxMzYyMTl9.dmyWwtQu9GLdS7ClSLxcXgQiKxmaG-JPDjQVxRXOpxs', + }); + + const unloginedDeep = new DeepClient({ apolloClient }); + const guest = await unloginedDeep.guest(); + const guestDeep = new DeepClient({ deep: unloginedDeep, ...guest }); + const admin = await guestDeep.login({ + linkId: await guestDeep.id('deep', 'admin'), + }); + const deep = new DeepClient({ deep: guestDeep, ...admin }); + + const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); + const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); + const plv8SupportsJsId = await deep.id( + '@deep-foundation/core', + 'plv8SupportsJs' + ); + + + const { + data: [{ id: LogInsert }], + } = await deep.insert({ + type_id: Type, + from_id: Any, + to_id: Any, + in: { + data: { + type_id: Contain, + from_id: packageId, // before created package + string: { data: { value: 'LogInsert' } }, + }, + }, + }); + console.log({ LogInsert }); + + const { + data: [{ id: LogUpdate }], + } = await deep.insert({ + type_id: Type, + from_id: Any, + to_id: Any, + in: { + data: { + type_id: Contain, + from_id: packageId, // before created package + string: { data: { value: 'LogUpdate' } }, + }, + }, + }); + console.log({ LogUpdate }); + + const { + data: [{ id: LogDelete }], + } = await deep.insert({ + type_id: Type, + from_id: Any, + to_id: Any, + in: { + data: { + type_id: Contain, + from_id: packageId, // before created package + string: { data: { value: 'LogDelete' } }, + }, + }, + }); + console.log({ LogDelete }); + + const insertHandler = async ({fileName, handlerName, handleName, triggerTypeId, code, supportsId, handleOperationTypeId}) => { + const { + data: [{ id: handlerId }], + } = await deep.insert({ + type_id: syncTextFileTypeId, + in: { + data: [ + { + type_id: Contain, + from_id: packageLinkId, // before created package + string: { data: { value: fileName } }, + }, + { + from_id: supportsId, + type_id: Handler, + in: { + data: [ + { + type_id: Contain, + from_id: packageLinkId, // before created package + string: { data: { value: handlerName } }, + }, + { + type_id: handleOperationTypeId, + from_id: triggerTypeId, + in: { + data: [ + { + type_id: Contain, + from_id: packageLinkId, // before created package + string: { data: { value: handleName } }, + }, + ], + }, + }, + ], + }, + }, + ], + }, + string: { + data: { + value: code, + }, + }, + }); + + return handlerId; + }; + + + + + const insertHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + deep.insert({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + from_id: deep.linkId, + to_id: newLink.id, + number: {data: {value: timestamp}} + }); + deep.insert({ + type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, + from_id: newLink.from_id, + to_id: newLink.to_id, + out: { + data: [{ + type_id: {_id: ["@deep-foundation/logger", "LogType"]}, + to_id: newLink.type_id + }] + } + }) + }`, + fileName: "insertHandlerFile", + handlerName: "insertHandler", + handleName: "insertHandle", + handleOperationTypeId: HandleInsert, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId + } + ); + console.log({insertHandlerId}); + + const updateHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const {data: [{id: logInsertId}]} = await deep.select({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + to_id: newLink.id + }) + + deep.update({ + type_id: {_id: ["@deep-foundation/logger", "LogUpdate"]}, + from_id: deep.linkId, + to_id: logInsertId, + number: {data: {value: timestamp}} + }) + }`, + fileName: "updateHandlerFile", + handlerName: "updateHandler", + handleName: "updateHandle", + handleOperationTypeId: HandleUpdate, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId + } + ); + console.log({updateHandlerId}); + + const deleteHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const {data: [{id: logInsertId}]} = await deep.select({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + to_id: newLink.id + }) + + deep.delete({ + type_id: {_id: ["@deep-foundation/logger", "LogDelete"]}, + from_id: deep.linkId, + to_id: logInsertId, + number: {data: {value: timestamp}} + }) + }`, + fileName: "deleteHandlerFile", + handlerName: "deleteHandler", + handleName: "deleteHandle", + handleOperationTypeId: HandleDelete, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId + } + ); + console.log({deleteHandlerId}); +}; + +installPackage(); From 7e19e109bbc52c1ee687c8ea269cc6ddbff317a6 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:15:02 +0000 Subject: [PATCH 02/51] Pass all args to insertHandler --- logger.cjs | 124 ++++++++++++++++++----------------------------------- 1 file changed, 41 insertions(+), 83 deletions(-) diff --git a/logger.cjs b/logger.cjs index fd388efc..ce43fd63 100644 --- a/logger.cjs +++ b/logger.cjs @@ -16,19 +16,15 @@ const axios = require('axios'); const uniqid = require('uniqid'); const { expect } = require('chai'); const { get } = require('lodash'); -const { - default: links, -} = require('@deep-foundation/deeplinks/imports/router/links'); -const { - insertHandler, -} = require('@deep-foundation/deeplinks/imports/handlers'); +const {default: links} = require('@deep-foundation/deeplinks/imports/router/links'); +const {insertHandler} = require('./deep-packages/insertHandler.cjs'); +const {sleep} = require('./deep-packages/sleep.cjs'); var myEnv = dotenv.config(); dotenvExpand.expand(myEnv); console.log('Installing payments-tinkoff-c2b package'); -const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); const allCreatedLinkIds = []; @@ -57,7 +53,7 @@ const installPackage = async () => { const plv8SupportsJsId = await deep.id( '@deep-foundation/core', 'plv8SupportsJs' - ); + ); const { @@ -108,60 +104,7 @@ const installPackage = async () => { }); console.log({ LogDelete }); - const insertHandler = async ({fileName, handlerName, handleName, triggerTypeId, code, supportsId, handleOperationTypeId}) => { - const { - data: [{ id: handlerId }], - } = await deep.insert({ - type_id: syncTextFileTypeId, - in: { - data: [ - { - type_id: Contain, - from_id: packageLinkId, // before created package - string: { data: { value: fileName } }, - }, - { - from_id: supportsId, - type_id: Handler, - in: { - data: [ - { - type_id: Contain, - from_id: packageLinkId, // before created package - string: { data: { value: handlerName } }, - }, - { - type_id: handleOperationTypeId, - from_id: triggerTypeId, - in: { - data: [ - { - type_id: Contain, - from_id: packageLinkId, // before created package - string: { data: { value: handleName } }, - }, - ], - }, - }, - ], - }, - }, - ], - }, - string: { - data: { - value: code, - }, - }, - }); - - return handlerId; - }; - - - - - const insertHandlerId = await insertHandler( + const insertHandlerId = await insertHandler( { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); @@ -183,15 +126,20 @@ const installPackage = async () => { } }) }`, - fileName: "insertHandlerFile", - handlerName: "insertHandler", - handleName: "insertHandle", - handleOperationTypeId: HandleInsert, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId + fileName: "insertHandlerFile", + handlerName: "insertHandler", + handleName: "insertHandle", + handleOperationTypeId: HandleInsert, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId } ); - console.log({insertHandlerId}); + console.log({ insertHandlerId }); const updateHandlerId = await insertHandler( { @@ -210,15 +158,20 @@ const installPackage = async () => { number: {data: {value: timestamp}} }) }`, - fileName: "updateHandlerFile", - handlerName: "updateHandler", - handleName: "updateHandle", - handleOperationTypeId: HandleUpdate, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId + fileName: "updateHandlerFile", + handlerName: "updateHandler", + handleName: "updateHandle", + handleOperationTypeId: HandleUpdate, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId, } ); - console.log({updateHandlerId}); + console.log({ updateHandlerId }); const deleteHandlerId = await insertHandler( { @@ -237,15 +190,20 @@ const installPackage = async () => { number: {data: {value: timestamp}} }) }`, - fileName: "deleteHandlerFile", - handlerName: "deleteHandler", - handleName: "deleteHandle", - handleOperationTypeId: HandleDelete, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId + fileName: "deleteHandlerFile", + handlerName: "deleteHandler", + handleName: "deleteHandle", + handleOperationTypeId: HandleDelete, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId } ); - console.log({deleteHandlerId}); + console.log({ deleteHandlerId }); }; installPackage(); From 46fe1bece989ae6209c52a287e88eb5568feb706 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:16:08 +0000 Subject: [PATCH 03/51] Add LogObject and Logtype --- logger.cjs | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/logger.cjs b/logger.cjs index ce43fd63..a4880e7e 100644 --- a/logger.cjs +++ b/logger.cjs @@ -104,6 +104,38 @@ const installPackage = async () => { }); console.log({ LogDelete }); + const { + data: [{ id: LogType }], + } = await deep.insert({ + type_id: Type, + from_id: Any, + to_id: Any, + in: { + data: { + type_id: Contain, + from_id: packageId, // before created package + string: { data: { value: 'LogType' } }, + }, + }, + }); + console.log({ LogType }); + + const { + data: [{ id: LogObject }], + } = await deep.insert({ + type_id: Type, + from_id: Any, + to_id: Any, + in: { + data: { + type_id: Contain, + from_id: packageId, // before created package + string: { data: { value: 'LogObject' } }, + }, + }, + }); + console.log({ LogObject }); + const insertHandlerId = await insertHandler( { code: `({deep, data: {newLink}}) => { From 5fe00e00d3e3fdc6e3b60c184fb64d5d786e4cd5 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:17:57 +0000 Subject: [PATCH 04/51] Add typeId to names --- logger.cjs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/logger.cjs b/logger.cjs index a4880e7e..f78785dc 100644 --- a/logger.cjs +++ b/logger.cjs @@ -57,7 +57,7 @@ const installPackage = async () => { const { - data: [{ id: LogInsert }], + data: [{ id: logInsertTypeId }], } = await deep.insert({ type_id: Type, from_id: Any, @@ -70,10 +70,10 @@ const installPackage = async () => { }, }, }); - console.log({ LogInsert }); + console.log({ logInsertTypeId }); const { - data: [{ id: LogUpdate }], + data: [{ id: logUpdateTypeId }], } = await deep.insert({ type_id: Type, from_id: Any, @@ -86,10 +86,10 @@ const installPackage = async () => { }, }, }); - console.log({ LogUpdate }); + console.log({ logUpdateTypeId }); const { - data: [{ id: LogDelete }], + data: [{ id: logDeleteTypeId }], } = await deep.insert({ type_id: Type, from_id: Any, @@ -102,10 +102,10 @@ const installPackage = async () => { }, }, }); - console.log({ LogDelete }); + console.log({ logDeleteTypeId }); const { - data: [{ id: LogType }], + data: [{ id: logTypeTypeId }], } = await deep.insert({ type_id: Type, from_id: Any, @@ -118,10 +118,10 @@ const installPackage = async () => { }, }, }); - console.log({ LogType }); + console.log({ logTypeTypeId }); const { - data: [{ id: LogObject }], + data: [{ id: logObjectTypeId }], } = await deep.insert({ type_id: Type, from_id: Any, @@ -134,7 +134,7 @@ const installPackage = async () => { }, }, }); - console.log({ LogObject }); + console.log({ logObjectTypeId }); const insertHandlerId = await insertHandler( { From 916b993c14350932151397cee1c6a977a10a6925 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:31:31 +0000 Subject: [PATCH 05/51] Fix typo --- deep-packages/insertHandler.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deep-packages/insertHandler.cjs b/deep-packages/insertHandler.cjs index 649dc7c2..99f7b278 100644 --- a/deep-packages/insertHandler.cjs +++ b/deep-packages/insertHandler.cjs @@ -1,4 +1,4 @@ -const insertHandler = async ({deep,fileTypeId, fileName, handlerName, handleName, triggerTypeId, code, supportsId, handleOperationTypeId, containTypeId, packageId, handlerTypeId, code}) => { +const insertHandler = async ({deep,fileTypeId, fileName, handlerName, handleName, triggerTypeId, code, supportsId, handleOperationTypeId, containTypeId, packageId, handlerTypeId}) => { return await deep.insert({ type_id: fileTypeId, in: { From 7a49b0b65b382167df747bb4c7ce01fd866f703d Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:32:34 +0000 Subject: [PATCH 06/51] Fix typo --- logger.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index f78785dc..ea193c6e 100644 --- a/logger.cjs +++ b/logger.cjs @@ -23,7 +23,7 @@ const {sleep} = require('./deep-packages/sleep.cjs'); var myEnv = dotenv.config(); dotenvExpand.expand(myEnv); -console.log('Installing payments-tinkoff-c2b package'); +console.log('Installing logger package'); const allCreatedLinkIds = []; From f13f81970e860424c6d60d4171c4799dd2c8cf0a Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:51:07 +0000 Subject: [PATCH 07/51] Fix typo --- logger.cjs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/logger.cjs b/logger.cjs index ea193c6e..d2f8f66c 100644 --- a/logger.cjs +++ b/logger.cjs @@ -59,7 +59,7 @@ const installPackage = async () => { const { data: [{ id: logInsertTypeId }], } = await deep.insert({ - type_id: Type, + type_id: TypeTypeId, from_id: Any, to_id: Any, in: { @@ -75,7 +75,7 @@ const installPackage = async () => { const { data: [{ id: logUpdateTypeId }], } = await deep.insert({ - type_id: Type, + type_id: TypeTypeId, from_id: Any, to_id: Any, in: { @@ -91,7 +91,7 @@ const installPackage = async () => { const { data: [{ id: logDeleteTypeId }], } = await deep.insert({ - type_id: Type, + type_id: TypeTypeId, from_id: Any, to_id: Any, in: { @@ -107,7 +107,7 @@ const installPackage = async () => { const { data: [{ id: logTypeTypeId }], } = await deep.insert({ - type_id: Type, + type_id: TypeTypeId, from_id: Any, to_id: Any, in: { @@ -123,7 +123,7 @@ const installPackage = async () => { const { data: [{ id: logObjectTypeId }], } = await deep.insert({ - type_id: Type, + type_id: TypeTypeId, from_id: Any, to_id: Any, in: { From 91940d2c5393ec2f310fd0a5cfee2a25f32d9096 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:53:07 +0000 Subject: [PATCH 08/51] Revert "Fix typo" This reverts commit f13f81970e860424c6d60d4171c4799dd2c8cf0a. --- logger.cjs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/logger.cjs b/logger.cjs index d2f8f66c..ea193c6e 100644 --- a/logger.cjs +++ b/logger.cjs @@ -59,7 +59,7 @@ const installPackage = async () => { const { data: [{ id: logInsertTypeId }], } = await deep.insert({ - type_id: TypeTypeId, + type_id: Type, from_id: Any, to_id: Any, in: { @@ -75,7 +75,7 @@ const installPackage = async () => { const { data: [{ id: logUpdateTypeId }], } = await deep.insert({ - type_id: TypeTypeId, + type_id: Type, from_id: Any, to_id: Any, in: { @@ -91,7 +91,7 @@ const installPackage = async () => { const { data: [{ id: logDeleteTypeId }], } = await deep.insert({ - type_id: TypeTypeId, + type_id: Type, from_id: Any, to_id: Any, in: { @@ -107,7 +107,7 @@ const installPackage = async () => { const { data: [{ id: logTypeTypeId }], } = await deep.insert({ - type_id: TypeTypeId, + type_id: Type, from_id: Any, to_id: Any, in: { @@ -123,7 +123,7 @@ const installPackage = async () => { const { data: [{ id: logObjectTypeId }], } = await deep.insert({ - type_id: TypeTypeId, + type_id: Type, from_id: Any, to_id: Any, in: { From 096aa85963e1d4c457d360d10574842f13a79cec Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:53:22 +0000 Subject: [PATCH 09/51] Fix typo --- logger.cjs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/logger.cjs b/logger.cjs index ea193c6e..4160bf53 100644 --- a/logger.cjs +++ b/logger.cjs @@ -59,7 +59,7 @@ const installPackage = async () => { const { data: [{ id: logInsertTypeId }], } = await deep.insert({ - type_id: Type, + type_id: typeTypeId, from_id: Any, to_id: Any, in: { @@ -75,7 +75,7 @@ const installPackage = async () => { const { data: [{ id: logUpdateTypeId }], } = await deep.insert({ - type_id: Type, + type_id: typeTypeId, from_id: Any, to_id: Any, in: { @@ -91,7 +91,7 @@ const installPackage = async () => { const { data: [{ id: logDeleteTypeId }], } = await deep.insert({ - type_id: Type, + type_id: typeTypeId, from_id: Any, to_id: Any, in: { @@ -107,7 +107,7 @@ const installPackage = async () => { const { data: [{ id: logTypeTypeId }], } = await deep.insert({ - type_id: Type, + type_id: typeTypeId, from_id: Any, to_id: Any, in: { @@ -123,7 +123,7 @@ const installPackage = async () => { const { data: [{ id: logObjectTypeId }], } = await deep.insert({ - type_id: Type, + type_id: typeTypeId, from_id: Any, to_id: Any, in: { From 6f757604a5a6616fa105dcc3b27613a36f0f127c Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:56:52 +0000 Subject: [PATCH 10/51] Add typeTypeId --- logger.cjs | 1 + 1 file changed, 1 insertion(+) diff --git a/logger.cjs b/logger.cjs index 4160bf53..05fa7dc6 100644 --- a/logger.cjs +++ b/logger.cjs @@ -48,6 +48,7 @@ const installPackage = async () => { }); const deep = new DeepClient({ deep: guestDeep, ...admin }); + const anyTypeId = await deep.id('@deep-foundation/core', 'Type'); const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); const plv8SupportsJsId = await deep.id( From 6926da76151595d4ce06113d65bd09cc439eebad Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:59:23 +0000 Subject: [PATCH 11/51] Fix typo --- logger.cjs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/logger.cjs b/logger.cjs index 05fa7dc6..ef519879 100644 --- a/logger.cjs +++ b/logger.cjs @@ -48,8 +48,8 @@ const installPackage = async () => { }); const deep = new DeepClient({ deep: guestDeep, ...admin }); - const anyTypeId = await deep.id('@deep-foundation/core', 'Type'); - const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); + const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); + const anyTypeId = await deep.id('@deep-foundation/core', 'anyTypeId'); const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); const plv8SupportsJsId = await deep.id( '@deep-foundation/core', @@ -61,8 +61,8 @@ const installPackage = async () => { data: [{ id: logInsertTypeId }], } = await deep.insert({ type_id: typeTypeId, - from_id: Any, - to_id: Any, + from_id: anyTypeId, + to_id: anyTypeId, in: { data: { type_id: Contain, @@ -77,8 +77,8 @@ const installPackage = async () => { data: [{ id: logUpdateTypeId }], } = await deep.insert({ type_id: typeTypeId, - from_id: Any, - to_id: Any, + from_id: anyTypeId, + to_id: anyTypeId, in: { data: { type_id: Contain, @@ -93,8 +93,8 @@ const installPackage = async () => { data: [{ id: logDeleteTypeId }], } = await deep.insert({ type_id: typeTypeId, - from_id: Any, - to_id: Any, + from_id: anyTypeId, + to_id: anyTypeId, in: { data: { type_id: Contain, @@ -109,8 +109,8 @@ const installPackage = async () => { data: [{ id: logTypeTypeId }], } = await deep.insert({ type_id: typeTypeId, - from_id: Any, - to_id: Any, + from_id: anyTypeId, + to_id: anyTypeId, in: { data: { type_id: Contain, @@ -125,8 +125,8 @@ const installPackage = async () => { data: [{ id: logObjectTypeId }], } = await deep.insert({ type_id: typeTypeId, - from_id: Any, - to_id: Any, + from_id: anyTypeId, + to_id: anyTypeId, in: { data: { type_id: Contain, From 572280f96aadc31fb27c35e31790119ae59610a0 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 12:59:49 +0000 Subject: [PATCH 12/51] Fix typo --- logger.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index ef519879..cca57f1e 100644 --- a/logger.cjs +++ b/logger.cjs @@ -49,7 +49,7 @@ const installPackage = async () => { const deep = new DeepClient({ deep: guestDeep, ...admin }); const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); - const anyTypeId = await deep.id('@deep-foundation/core', 'anyTypeId'); + const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); const plv8SupportsJsId = await deep.id( '@deep-foundation/core', From 2a5a68dd8f71cf19b812d0a77dc656f6c0dbe2ef Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:01:32 +0000 Subject: [PATCH 13/51] Add containTypeId, insert package --- logger.cjs | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/logger.cjs b/logger.cjs index cca57f1e..afab7d30 100644 --- a/logger.cjs +++ b/logger.cjs @@ -48,6 +48,7 @@ const installPackage = async () => { }); const deep = new DeepClient({ deep: guestDeep, ...admin }); + const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); @@ -56,6 +57,28 @@ const installPackage = async () => { 'plv8SupportsJs' ); + const { data: [{ id: packageId }] } = await deep.insert({ + type_id: Package, + string: { data: { value: `@deep-foundation/payments` } }, + in: { data: [ + { + type_id: Contain, + from_id: deep.linkId + }, + ] }, + out: { data: [ + { + type_id: Join, + to_id: await deep.id('deep', 'users', 'packages'), + }, + { + type_id: Join, + to_id: await deep.id('deep', 'admin'), + }, + ] }, + }); + + console.log({ packageId }); const { data: [{ id: logInsertTypeId }], @@ -65,7 +88,7 @@ const installPackage = async () => { to_id: anyTypeId, in: { data: { - type_id: Contain, + type_id: containTypeId, from_id: packageId, // before created package string: { data: { value: 'LogInsert' } }, }, @@ -81,7 +104,7 @@ const installPackage = async () => { to_id: anyTypeId, in: { data: { - type_id: Contain, + type_id: containTypeId, from_id: packageId, // before created package string: { data: { value: 'LogUpdate' } }, }, @@ -97,7 +120,7 @@ const installPackage = async () => { to_id: anyTypeId, in: { data: { - type_id: Contain, + type_id: containTypeId, from_id: packageId, // before created package string: { data: { value: 'LogDelete' } }, }, @@ -113,7 +136,7 @@ const installPackage = async () => { to_id: anyTypeId, in: { data: { - type_id: Contain, + type_id: containTypeId, from_id: packageId, // before created package string: { data: { value: 'LogType' } }, }, @@ -129,7 +152,7 @@ const installPackage = async () => { to_id: anyTypeId, in: { data: { - type_id: Contain, + type_id: containTypeId, from_id: packageId, // before created package string: { data: { value: 'LogObject' } }, }, From a6b358a04a4b605ca2ee7f18bbe2d44412d77c20 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:01:59 +0000 Subject: [PATCH 14/51] Add packageTypeId --- logger.cjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index afab7d30..8b462e41 100644 --- a/logger.cjs +++ b/logger.cjs @@ -50,6 +50,7 @@ const installPackage = async () => { const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); + const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); const plv8SupportsJsId = await deep.id( @@ -58,7 +59,7 @@ const installPackage = async () => { ); const { data: [{ id: packageId }] } = await deep.insert({ - type_id: Package, + type_id: packageTypeId, string: { data: { value: `@deep-foundation/payments` } }, in: { data: [ { From aecebadb0de90ba48eea24543bbf1c18809abd05 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:04:48 +0000 Subject: [PATCH 15/51] Fix typo --- logger.cjs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logger.cjs b/logger.cjs index 8b462e41..ac0e41ad 100644 --- a/logger.cjs +++ b/logger.cjs @@ -63,22 +63,22 @@ const installPackage = async () => { string: { data: { value: `@deep-foundation/payments` } }, in: { data: [ { - type_id: Contain, + type_id: containTypeId, from_id: deep.linkId }, ] }, out: { data: [ { - type_id: Join, + type_id: joinTypeId, to_id: await deep.id('deep', 'users', 'packages'), }, { - type_id: Join, + type_id: joinTypeId, to_id: await deep.id('deep', 'admin'), }, ] }, }); - + console.log({ packageId }); const { From 40f7d86801507ca2d82bcc024edda0c7b360063f Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:06:17 +0000 Subject: [PATCH 16/51] Get types --- logger.cjs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/logger.cjs b/logger.cjs index ac0e41ad..24751899 100644 --- a/logger.cjs +++ b/logger.cjs @@ -53,10 +53,8 @@ const installPackage = async () => { const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); - const plv8SupportsJsId = await deep.id( - '@deep-foundation/core', - 'plv8SupportsJs' - ); + const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); + const plv8SupportsJsId = await deep.id('@deep-foundation/core','plv8SupportsJs'); const { data: [{ id: packageId }] } = await deep.insert({ type_id: packageTypeId, From 9bd64f67352a986253d1de9e824cd65d961cfc9d Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:07:48 +0000 Subject: [PATCH 17/51] Add types, fix typos --- logger.cjs | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index 24751899..cddad891 100644 --- a/logger.cjs +++ b/logger.cjs @@ -48,6 +48,43 @@ const installPackage = async () => { }); const deep = new DeepClient({ deep: guestDeep, ...admin }); + const dockerSupportsJs = await deep.id( + '@deep-foundation/core', + 'dockerSupportsJs' + ); + const handleInsertTypeId = await deep.id('@deep-foundation/core', 'handleInsertTypeId'); + const portTypeId = await deep.id('@deep-foundation/core', 'Port'); + const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); + const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); + const routerStringUseTypeId = await deep.id( + '@deep-foundation/core', + 'RouterStringUse' + ); + const routeTypeId = await deep.id('@deep-foundation/core', 'Route'); + const handleRouteTypeId = await deep.id( + '@deep-foundation/core', + 'HandleRoute' + ); + const handlerTypeId = await deep.id( + '@deep-foundation/core', + 'Handler' + ); + const dockerSupportsJsId = await deep.id( + '@deep-foundation/core', + 'dockerSupportsJs' + ); + + const treeTypeId = await deep.id('@deep-foundation/core', 'Tree'); + const treeIncludeNodeTypeId = await deep.id( + '@deep-foundation/core', + 'TreeIncludeNode' + ); + const treeIncludeUpTypeId = await deep.id('@deep-foundation/core', 'TreeIncludeUp'); + const treeIncludeDownTypeId = await deep.id( + '@deep-foundation/core', + 'TreeIncludeDown' + ); + const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); @@ -184,7 +221,7 @@ const installPackage = async () => { fileName: "insertHandlerFile", handlerName: "insertHandler", handleName: "insertHandle", - handleOperationTypeId: HandleInsert, + handleOperationTypeId: handleInsertTypeId, supportsId: plv8SupportsJsId, triggerTypeId: anyTypeId, containTypeId, From 69710a8b8f4faa852dd220f34a68ac0277ec1705 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:08:39 +0000 Subject: [PATCH 18/51] Fix typo --- logger.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index cddad891..a34c1b94 100644 --- a/logger.cjs +++ b/logger.cjs @@ -52,7 +52,7 @@ const installPackage = async () => { '@deep-foundation/core', 'dockerSupportsJs' ); - const handleInsertTypeId = await deep.id('@deep-foundation/core', 'handleInsertTypeId'); + const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); const portTypeId = await deep.id('@deep-foundation/core', 'Port'); const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); From 387d3defbfff8eb567412c414e621d10108eb7ec Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:09:36 +0000 Subject: [PATCH 19/51] Add types, fix typos --- test.cjs | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 test.cjs diff --git a/test.cjs b/test.cjs new file mode 100644 index 00000000..6ad8e1cb --- /dev/null +++ b/test.cjs @@ -0,0 +1,196 @@ +const crypto = require('crypto'); +const axios = require('axios'); +const dotenv = require('dotenv'); +const dotenvExpand = require('dotenv-expand'); +const uniqid = require('uniqid'); +const {payInBrowser} = require("./deep-packges/payments/tinkoff/payInBrowser.cjs"); +const puppeteer = require('puppeteer'); + + + +var myEnv = dotenv.config(); +dotenvExpand.expand(myEnv); + +const CUSTOMER_KEY = "4xf3366al8af85a4"; + +const f = async () => { + console.log("process.env.PAYMENTS_C2B_TERMINAL_PASSWORD", process.env.PAYMENTS_C2B_TERMINAL_PASSWORD) + + const errorsConverter = { + 7: 'Покупатель не найден', + 53: 'Обратитесь к продавцу', + 99: 'Платеж отклонен', + 100: 'Повторите попытку позже', + 101: 'Не пройдена идентификация 3DS', + 102: 'Операция отклонена, пожалуйста обратитесь в интернет-магазин или воспользуйтесь другой картой', + 103: 'Повторите попытку позже', + 119: 'Превышено кол-во запросов на авторизацию', + 191: 'Некорректный статус договора, обратитесь к вашему менеджеру', + 1001: 'Свяжитесь с банком, выпустившим карту, чтобы провести платеж', + 1003: 'Неверный merchant ID', + 1004: 'Карта украдена. Свяжитесь с банком, выпустившим карту', + 1005: 'Платеж отклонен банком, выпустившим карту', + 1006: 'Свяжитесь с банком, выпустившим карту, чтобы провести платеж', + 1007: 'Карта украдена. Свяжитесь с банком, выпустившим карту', + 1008: 'Платеж отклонен, необходима идентификация', + 1012: 'Такие операции запрещены для этой карты', + 1013: 'Повторите попытку позже', + 1014: 'Карта недействительна. Свяжитесь с банком, выпустившим карту', + 1015: 'Попробуйте снова или свяжитесь с банком, выпустившим карту', + 1019: 'Платеж отклонен — попробуйте снова', + 1030: 'Повторите попытку позже', + 1033: 'Истек срок действия карты. Свяжитесь с банком, выпустившим карту', + 1034: 'Попробуйте повторить попытку позже', + 1038: 'Превышено количество попыток ввода ПИН-кода', + 1039: 'Платеж отклонен — счет не найден', + 1041: 'Карта утеряна. Свяжитесь с банком, выпустившим карту', + 1043: 'Карта украдена. Свяжитесь с банком, выпустившим карту', + 1051: 'Недостаточно средств на карте', + 1053: 'Платеж отклонен — счет не найден', + 1054: 'Истек срок действия карты', + 1055: 'Неверный ПИН', + 1057: 'Такие операции запрещены для этой карты', + 1058: 'Такие операции запрещены для этой карты', + 1059: 'Подозрение в мошенничестве. Свяжитесь с банком, выпустившим карту', + 1061: 'Превышен дневной лимит платежей по карте', + 1062: 'Платежи по карте ограничены', + 1063: 'Операции по карте ограничены', + 1064: 'Проверьте сумму', + 1065: 'Превышен дневной лимит транзакций', + 1075: 'Превышено число попыток ввода ПИН-кода', + 1076: 'Платеж отклонен — попробуйте снова', + 1077: 'Коды не совпадают — попробуйте снова', + 1080: 'Неверный срок действия', + 1082: 'Неверный CVV', + 1086: 'Платеж отклонен — не получилось подтвердить ПИН-код', + 1088: 'Ошибка шифрования. Попробуйте снова', + 1089: 'Попробуйте повторить попытку позже', + 1091: 'Банк, выпустивший карту недоступен для проведения авторизации', + 1092: 'Платеж отклонен — попробуйте снова', + 1093: 'Подозрение в мошенничестве. Свяжитесь с банком, выпустившим карту', + 1094: 'Системная ошибка', + 1096: 'Повторите попытку позже', + 9999: 'Внутренняя ошибка системы', + }; + + const getError = (errorCode) => + errorCode === '0' ? undefined : errorsConverter[errorCode] || 'broken'; + + const getUrl = (method) => + `${process.env.PAYMENTS_C2B_URL}/${method}`; + +const _generateToken = (dataWithPassword) => { + const dataString = Object.keys(dataWithPassword) + .sort((a, b) => a.localeCompare(b)) + .map((key) => dataWithPassword[key]) + .reduce((acc, item) => `${acc}${item}`, ''); + console.log({ dataString }); + const hash = crypto.createHash('sha256').update(dataString).digest('hex'); + console.log({ hash }); + return hash; + }; + + const generateToken = (data) => { + const { Receipt, DATA, Shops, ...restData } = data; + const dataWithPassword = { + ...restData, + Password: process.env.PAYMENTS_C2B_TERMINAL_PASSWORD, + }; + console.log({ dataWithPassword }); + return _generateToken(dataWithPassword); + }; + + const init = async (options) => { + try { + const response = await axios({ + method: 'post', + url: getUrl('Init'), + headers: { + 'Content-Type': 'application/json', + }, + data: { ...options, Token: generateToken(options) }, + }); + + const error = getError(response.data.ErrorCode); + + return { + error, + request: options, + response: response.data, + }; + } catch (error) { + return { + error, + request: options, + response: null, + }; + } + }; + + const options = { + TerminalKey: process.env.PAYMENTS_C2B_TERMINAL_KEY, + OrderId: uniqid(), + CustomerKey: CUSTOMER_KEY, + PayType: 'T', + Amount: 5500, + Description: 'Test shopping', + Language: 'ru', + Recurrent: 'Y', + DATA: { + Email: process.env.PAYMENTS_C2B_PHONE, + Phone: process.env.PAYMENTS_C2B_EMAIL, + // "DefaultCard": 10495015 + } + }; + console.log({options}); + + const getCardList = async (options) => { + try { + const response = await axios({ + method: 'post', + url: getUrl('GetCardList'), + headers: { + 'Content-Type': 'application/json', + }, + data: { ...options, Token: generateToken(options) }, + }); + + const error = getError(response.data.ErrorCode || '0'); + + return { + error, + request: options, + response: response.data, + }; + } catch (error) { + return { + error, + request: options, + response: null, + }; + } + }; + + + + + let initResult = await init(options); + console.log({initResult}); + + const getCardListOptions = { + TerminalKey: process.env.PAYMENTS_C2B_TERMINAL_KEY, + CustomerKey: CUSTOMER_KEY, + }; + + console.log(await getCardList(getCardListOptions)); + + const browser = await puppeteer.launch({ args: [/*'--no-sandbox'*/] }); + const page = await browser.newPage(); + await payInBrowser({ + browser, + page, + url: initResult.response.PaymentURL, + }); +} + +f(); \ No newline at end of file From 60372275023d32ae3730d99268d8aef325051249 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 19 Oct 2022 13:26:07 +0000 Subject: [PATCH 20/51] Get more types --- logger.cjs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/logger.cjs b/logger.cjs index a34c1b94..03f5cfe5 100644 --- a/logger.cjs +++ b/logger.cjs @@ -53,6 +53,8 @@ const installPackage = async () => { 'dockerSupportsJs' ); const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); + const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); + const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); const portTypeId = await deep.id('@deep-foundation/core', 'Port'); const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); @@ -253,7 +255,7 @@ const installPackage = async () => { fileName: "updateHandlerFile", handlerName: "updateHandler", handleName: "updateHandle", - handleOperationTypeId: HandleUpdate, + handleOperationTypeId: handleUpdateTypeId, supportsId: plv8SupportsJsId, triggerTypeId: anyTypeId, containTypeId, @@ -285,7 +287,7 @@ const installPackage = async () => { fileName: "deleteHandlerFile", handlerName: "deleteHandler", handleName: "deleteHandle", - handleOperationTypeId: HandleDelete, + handleOperationTypeId: handleDeleteTypeId, supportsId: plv8SupportsJsId, triggerTypeId: anyTypeId, containTypeId, @@ -296,6 +298,10 @@ const installPackage = async () => { } ); console.log({ deleteHandlerId }); + + const callTests = async () => { + callTests + } }; installPackage(); From c8a287fe813334e0ef2c9054f1c57675c112aa34 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 20 Oct 2022 08:07:23 +0000 Subject: [PATCH 21/51] Add tests, update names, update handlers --- logger.cjs | 116 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 105 insertions(+), 11 deletions(-) diff --git a/logger.cjs b/logger.cjs index 03f5cfe5..9045ca7a 100644 --- a/logger.cjs +++ b/logger.cjs @@ -202,13 +202,8 @@ const installPackage = async () => { { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); - deep.insert({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - from_id: deep.linkId, - to_id: newLink.id, - number: {data: {value: timestamp}} - }); - deep.insert({ + + const {data: [{logObjectId}]} = deep.insert({ type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, from_id: newLink.from_id, to_id: newLink.to_id, @@ -218,7 +213,14 @@ const installPackage = async () => { to_id: newLink.type_id }] } - }) + }); + + const {data: [{logInsertId}]} = deep.insert({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + from_id: logObjectId, + to_id: newLink.id, + number: {data: {value: timestamp}} + }); }`, fileName: "insertHandlerFile", handlerName: "insertHandler", @@ -240,7 +242,7 @@ const installPackage = async () => { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); - const {data: [{id: logInsertId}]} = await deep.select({ + const {data: [{id: logInsertId}]} = deep.select({ type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, to_id: newLink.id }) @@ -272,7 +274,7 @@ const installPackage = async () => { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); - const {data: [{id: logInsertId}]} = await deep.select({ + const {data: [{id: logInsertId}]} = deep.select({ type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, to_id: newLink.id }) @@ -300,8 +302,100 @@ const installPackage = async () => { console.log({ deleteHandlerId }); const callTests = async () => { - callTests + const {data: [{id: customTypeId}]} = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId + }); + + const {data: [{id: linkId}]} = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId + }); + + var logInsertId; + for (let i = 0; i < 10; i++) { + const {data}= await deep.select({ + type_id: logInsertTypeId, + to_id: linkId + }); + if(data.length > 0) { + logInsertId = data[0].id; + break; + } + await sleep(1000); + } + expect(logInsertId).to.not.be.equal(undefined); + + var logObjectId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logObjectTypeId, + from_id: linkId.from_id, + to_id: linkId.to_id + }); + if(data.length > 0) { + logObjectId = data[0].id; + break; + } + await sleep(1000); + } + expect(logObjectId).to.not.be.equal(undefined); + + var logTypeId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logTypeTypeId, + from_id: logObjectId, + to_id: customTypeId + }); + if(data.length > 0) { + logTypeId = data[0].id; + break; + } + await sleep(1000); + } + expect(logTypeId).to.not.be.equal(undefined); + + await deep.insert({link_id: linkId, value: "string"}, {table: "strings"}); + + var logUpdateId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logUpdateTypeId, + from_id: deep.linkId, + to_id: logInsertId + }); + if(data.length > 0) { + logUpdateId = data[0].id; + break; + } + await sleep(1000); + } + expect(logUpdateId).to.not.be.equal(undefined); + + await deep.delete({ + id: linkId + }); + + var logDeleteId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logDeleteTypeId, + from_id: deep.linkId, + to_id: logInsertId + }); + if(data.length > 0) { + logDeleteId = data[0].id; + break; + } + await sleep(1000); + } + expect(logDeleteId).to.not.be.equal(undefined); } + + await callTests(); }; installPackage(); From a5ac2bc9aadd0a1ea555c0923dbdd6ad7028c81a Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sun, 23 Oct 2022 10:41:54 +0000 Subject: [PATCH 22/51] Use spaces --- logger.cjs | 692 ++++++++++++++++++++++++++--------------------------- 1 file changed, 346 insertions(+), 346 deletions(-) diff --git a/logger.cjs b/logger.cjs index 9045ca7a..810175a0 100644 --- a/logger.cjs +++ b/logger.cjs @@ -7,8 +7,8 @@ const dotenvExpand = require('dotenv-expand'); const { generateApolloClient } = require('@deep-foundation/hasura/client'); const { DeepClient } = require('@deep-foundation/deeplinks/imports/client'); const { - minilinks, - Link, + minilinks, + Link, } = require('@deep-foundation/deeplinks/imports/minilinks'); const puppeteer = require('puppeteer'); const crypto = require('crypto'); @@ -31,71 +31,71 @@ const allCreatedLinkIds = []; const installPackage = async () => { - const apolloClient = generateApolloClient({ - path: process.env.NEXT_PUBLIC_GQL_PATH || '', // <<= HERE PATH TO UPDATE - ssl: !!~process.env.NEXT_PUBLIC_GQL_PATH.indexOf('localhost') - ? false - : true, - // admin token in prealpha deep secret key - // token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibGluayJdLCJ4LWhhc3VyYS1kZWZhdWx0LXJvbGUiOiJsaW5rIiwieC1oYXN1cmEtdXNlci1pZCI6IjI2MiJ9LCJpYXQiOjE2NTYxMzYyMTl9.dmyWwtQu9GLdS7ClSLxcXgQiKxmaG-JPDjQVxRXOpxs', - }); - - const unloginedDeep = new DeepClient({ apolloClient }); - const guest = await unloginedDeep.guest(); - const guestDeep = new DeepClient({ deep: unloginedDeep, ...guest }); - const admin = await guestDeep.login({ - linkId: await guestDeep.id('deep', 'admin'), - }); - const deep = new DeepClient({ deep: guestDeep, ...admin }); - - const dockerSupportsJs = await deep.id( - '@deep-foundation/core', - 'dockerSupportsJs' - ); - const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); - const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); - const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); - const portTypeId = await deep.id('@deep-foundation/core', 'Port'); - const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); - const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); - const routerStringUseTypeId = await deep.id( - '@deep-foundation/core', - 'RouterStringUse' - ); - const routeTypeId = await deep.id('@deep-foundation/core', 'Route'); - const handleRouteTypeId = await deep.id( - '@deep-foundation/core', - 'HandleRoute' - ); - const handlerTypeId = await deep.id( - '@deep-foundation/core', - 'Handler' - ); - const dockerSupportsJsId = await deep.id( - '@deep-foundation/core', - 'dockerSupportsJs' - ); - - const treeTypeId = await deep.id('@deep-foundation/core', 'Tree'); - const treeIncludeNodeTypeId = await deep.id( - '@deep-foundation/core', - 'TreeIncludeNode' - ); - const treeIncludeUpTypeId = await deep.id('@deep-foundation/core', 'TreeIncludeUp'); - const treeIncludeDownTypeId = await deep.id( - '@deep-foundation/core', - 'TreeIncludeDown' - ); - - const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); - const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); - const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); - const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); - const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); - const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); - const plv8SupportsJsId = await deep.id('@deep-foundation/core','plv8SupportsJs'); - - const { data: [{ id: packageId }] } = await deep.insert({ + const apolloClient = generateApolloClient({ + path: process.env.NEXT_PUBLIC_GQL_PATH || '', // <<= HERE PATH TO UPDATE + ssl: !!~process.env.NEXT_PUBLIC_GQL_PATH.indexOf('localhost') + ? false + : true, + // admin token in prealpha deep secret key + // token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibGluayJdLCJ4LWhhc3VyYS1kZWZhdWx0LXJvbGUiOiJsaW5rIiwieC1oYXN1cmEtdXNlci1pZCI6IjI2MiJ9LCJpYXQiOjE2NTYxMzYyMTl9.dmyWwtQu9GLdS7ClSLxcXgQiKxmaG-JPDjQVxRXOpxs', + }); + + const unloginedDeep = new DeepClient({ apolloClient }); + const guest = await unloginedDeep.guest(); + const guestDeep = new DeepClient({ deep: unloginedDeep, ...guest }); + const admin = await guestDeep.login({ + linkId: await guestDeep.id('deep', 'admin'), + }); + const deep = new DeepClient({ deep: guestDeep, ...admin }); + + const dockerSupportsJs = await deep.id( + '@deep-foundation/core', + 'dockerSupportsJs' + ); + const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); + const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); + const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); + const portTypeId = await deep.id('@deep-foundation/core', 'Port'); + const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); + const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); + const routerStringUseTypeId = await deep.id( + '@deep-foundation/core', + 'RouterStringUse' + ); + const routeTypeId = await deep.id('@deep-foundation/core', 'Route'); + const handleRouteTypeId = await deep.id( + '@deep-foundation/core', + 'HandleRoute' + ); + const handlerTypeId = await deep.id( + '@deep-foundation/core', + 'Handler' + ); + const dockerSupportsJsId = await deep.id( + '@deep-foundation/core', + 'dockerSupportsJs' + ); + + const treeTypeId = await deep.id('@deep-foundation/core', 'Tree'); + const treeIncludeNodeTypeId = await deep.id( + '@deep-foundation/core', + 'TreeIncludeNode' + ); + const treeIncludeUpTypeId = await deep.id('@deep-foundation/core', 'TreeIncludeUp'); + const treeIncludeDownTypeId = await deep.id( + '@deep-foundation/core', + 'TreeIncludeDown' + ); + + const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); + const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); + const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); + const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); + const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); + const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); + const plv8SupportsJsId = await deep.id('@deep-foundation/core','plv8SupportsJs'); + + const { data: [{ id: packageId }] } = await deep.insert({ type_id: packageTypeId, string: { data: { value: `@deep-foundation/payments` } }, in: { data: [ @@ -115,287 +115,287 @@ const installPackage = async () => { }, ] }, }); - + console.log({ packageId }); - const { - data: [{ id: logInsertTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogInsert' } }, - }, - }, - }); - console.log({ logInsertTypeId }); - - const { - data: [{ id: logUpdateTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogUpdate' } }, - }, - }, - }); - console.log({ logUpdateTypeId }); - - const { - data: [{ id: logDeleteTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogDelete' } }, - }, - }, - }); - console.log({ logDeleteTypeId }); - - const { - data: [{ id: logTypeTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogType' } }, - }, - }, - }); - console.log({ logTypeTypeId }); - - const { - data: [{ id: logObjectTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogObject' } }, - }, - }, - }); - console.log({ logObjectTypeId }); - - const insertHandlerId = await insertHandler( - { - code: `({deep, data: {newLink}}) => { - const timestamp = Date.now(); - - const {data: [{logObjectId}]} = deep.insert({ - type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, - from_id: newLink.from_id, - to_id: newLink.to_id, - out: { - data: [{ - type_id: {_id: ["@deep-foundation/logger", "LogType"]}, - to_id: newLink.type_id - }] - } - }); - - const {data: [{logInsertId}]} = deep.insert({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - from_id: logObjectId, - to_id: newLink.id, - number: {data: {value: timestamp}} - }); - }`, - fileName: "insertHandlerFile", - handlerName: "insertHandler", - handleName: "insertHandle", - handleOperationTypeId: handleInsertTypeId, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId, - containTypeId, - deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, - packageId - } - ); - console.log({ insertHandlerId }); - - const updateHandlerId = await insertHandler( - { - code: `({deep, data: {newLink}}) => { - const timestamp = Date.now(); - - const {data: [{id: logInsertId}]} = deep.select({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - to_id: newLink.id - }) - - deep.update({ - type_id: {_id: ["@deep-foundation/logger", "LogUpdate"]}, - from_id: deep.linkId, - to_id: logInsertId, - number: {data: {value: timestamp}} - }) - }`, - fileName: "updateHandlerFile", - handlerName: "updateHandler", - handleName: "updateHandle", - handleOperationTypeId: handleUpdateTypeId, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId, - containTypeId, - deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, - packageId, - } - ); - console.log({ updateHandlerId }); - - const deleteHandlerId = await insertHandler( - { - code: `({deep, data: {newLink}}) => { - const timestamp = Date.now(); - - const {data: [{id: logInsertId}]} = deep.select({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - to_id: newLink.id - }) - - deep.delete({ - type_id: {_id: ["@deep-foundation/logger", "LogDelete"]}, - from_id: deep.linkId, - to_id: logInsertId, - number: {data: {value: timestamp}} - }) - }`, - fileName: "deleteHandlerFile", - handlerName: "deleteHandler", - handleName: "deleteHandle", - handleOperationTypeId: handleDeleteTypeId, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId, - containTypeId, - deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, - packageId - } - ); - console.log({ deleteHandlerId }); - - const callTests = async () => { - const {data: [{id: customTypeId}]} = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId - }); - - const {data: [{id: linkId}]} = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId - }); - - var logInsertId; - for (let i = 0; i < 10; i++) { - const {data}= await deep.select({ - type_id: logInsertTypeId, - to_id: linkId - }); - if(data.length > 0) { - logInsertId = data[0].id; - break; - } - await sleep(1000); - } - expect(logInsertId).to.not.be.equal(undefined); - - var logObjectId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logObjectTypeId, - from_id: linkId.from_id, - to_id: linkId.to_id - }); - if(data.length > 0) { - logObjectId = data[0].id; - break; - } - await sleep(1000); - } - expect(logObjectId).to.not.be.equal(undefined); - - var logTypeId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logTypeTypeId, - from_id: logObjectId, - to_id: customTypeId - }); - if(data.length > 0) { - logTypeId = data[0].id; - break; - } - await sleep(1000); - } - expect(logTypeId).to.not.be.equal(undefined); - - await deep.insert({link_id: linkId, value: "string"}, {table: "strings"}); - - var logUpdateId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logUpdateTypeId, - from_id: deep.linkId, - to_id: logInsertId - }); - if(data.length > 0) { - logUpdateId = data[0].id; - break; - } - await sleep(1000); - } - expect(logUpdateId).to.not.be.equal(undefined); - - await deep.delete({ - id: linkId - }); - - var logDeleteId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logDeleteTypeId, - from_id: deep.linkId, - to_id: logInsertId - }); - if(data.length > 0) { - logDeleteId = data[0].id; - break; - } - await sleep(1000); - } - expect(logDeleteId).to.not.be.equal(undefined); - } - - await callTests(); + const { + data: [{ id: logInsertTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogInsert' } }, + }, + }, + }); + console.log({ logInsertTypeId }); + + const { + data: [{ id: logUpdateTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogUpdate' } }, + }, + }, + }); + console.log({ logUpdateTypeId }); + + const { + data: [{ id: logDeleteTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogDelete' } }, + }, + }, + }); + console.log({ logDeleteTypeId }); + + const { + data: [{ id: logTypeTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogType' } }, + }, + }, + }); + console.log({ logTypeTypeId }); + + const { + data: [{ id: logObjectTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogObject' } }, + }, + }, + }); + console.log({ logObjectTypeId }); + + const insertHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const {data: [{logObjectId}]} = deep.insert({ + type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, + from_id: newLink.from_id, + to_id: newLink.to_id, + out: { + data: [{ + type_id: {_id: ["@deep-foundation/logger", "LogType"]}, + to_id: newLink.type_id + }] + } + }); + + const {data: [{logInsertId}]} = deep.insert({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + from_id: logObjectId, + to_id: newLink.id, + number: {data: {value: timestamp}} + }); + }`, + fileName: "insertHandlerFile", + handlerName: "insertHandler", + handleName: "insertHandle", + handleOperationTypeId: handleInsertTypeId, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId + } + ); + console.log({ insertHandlerId }); + + const updateHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const {data: [{id: logInsertId}]} = deep.select({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + to_id: newLink.id + }) + + deep.update({ + type_id: {_id: ["@deep-foundation/logger", "LogUpdate"]}, + from_id: deep.linkId, + to_id: logInsertId, + number: {data: {value: timestamp}} + }) + }`, + fileName: "updateHandlerFile", + handlerName: "updateHandler", + handleName: "updateHandle", + handleOperationTypeId: handleUpdateTypeId, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId, + } + ); + console.log({ updateHandlerId }); + + const deleteHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const {data: [{id: logInsertId}]} = deep.select({ + type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + to_id: newLink.id + }) + + deep.delete({ + type_id: {_id: ["@deep-foundation/logger", "LogDelete"]}, + from_id: deep.linkId, + to_id: logInsertId, + number: {data: {value: timestamp}} + }) + }`, + fileName: "deleteHandlerFile", + handlerName: "deleteHandler", + handleName: "deleteHandle", + handleOperationTypeId: handleDeleteTypeId, + supportsId: plv8SupportsJsId, + triggerTypeId: anyTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId + } + ); + console.log({ deleteHandlerId }); + + const callTests = async () => { + const {data: [{id: customTypeId}]} = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId + }); + + const {data: [{id: linkId}]} = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId + }); + + var logInsertId; + for (let i = 0; i < 10; i++) { + const {data}= await deep.select({ + type_id: logInsertTypeId, + to_id: linkId + }); + if(data.length > 0) { + logInsertId = data[0].id; + break; + } + await sleep(1000); + } + expect(logInsertId).to.not.be.equal(undefined); + + var logObjectId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logObjectTypeId, + from_id: linkId.from_id, + to_id: linkId.to_id + }); + if(data.length > 0) { + logObjectId = data[0].id; + break; + } + await sleep(1000); + } + expect(logObjectId).to.not.be.equal(undefined); + + var logTypeId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logTypeTypeId, + from_id: logObjectId, + to_id: customTypeId + }); + if(data.length > 0) { + logTypeId = data[0].id; + break; + } + await sleep(1000); + } + expect(logTypeId).to.not.be.equal(undefined); + + await deep.insert({link_id: linkId, value: "string"}, {table: "strings"}); + + var logUpdateId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logUpdateTypeId, + from_id: deep.linkId, + to_id: logInsertId + }); + if(data.length > 0) { + logUpdateId = data[0].id; + break; + } + await sleep(1000); + } + expect(logUpdateId).to.not.be.equal(undefined); + + await deep.delete({ + id: linkId + }); + + var logDeleteId; + for (let i = 0; i < 10; i++) { + const {data} = await deep.select({ + type_id: logDeleteTypeId, + from_id: deep.linkId, + to_id: logInsertId + }); + if(data.length > 0) { + logDeleteId = data[0].id; + break; + } + await sleep(1000); + } + expect(logDeleteId).to.not.be.equal(undefined); + } + + await callTests(); }; installPackage(); From 3ec8ce10dcb88591d00a43b9da1a445218fdd626 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sun, 30 Oct 2022 10:01:29 +0000 Subject: [PATCH 23/51] Temporarily try to use async handler --- logger.cjs | 415 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 233 insertions(+), 182 deletions(-) diff --git a/logger.cjs b/logger.cjs index 810175a0..0b57543a 100644 --- a/logger.cjs +++ b/logger.cjs @@ -97,7 +97,7 @@ const installPackage = async () => { const { data: [{ id: packageId }] } = await deep.insert({ type_id: packageTypeId, - string: { data: { value: `@deep-foundation/payments` } }, + string: { data: { value: `@deep-foundation/logger` } }, in: { data: [ { type_id: containTypeId, @@ -134,6 +134,22 @@ const installPackage = async () => { }); console.log({ logInsertTypeId }); + const { + data: [{ id: debugLogTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'DebugLog' } }, + }, + }, + }); + console.log({ debugLog: debugLogTypeId }); + const { data: [{ id: logUpdateTypeId }], } = await deep.insert({ @@ -198,36 +214,17 @@ const installPackage = async () => { }); console.log({ logObjectTypeId }); - const insertHandlerId = await insertHandler( + const insertHandlerId1 = await insertHandler( { - code: `({deep, data: {newLink}}) => { - const timestamp = Date.now(); - - const {data: [{logObjectId}]} = deep.insert({ - type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, - from_id: newLink.from_id, - to_id: newLink.to_id, - out: { - data: [{ - type_id: {_id: ["@deep-foundation/logger", "LogType"]}, - to_id: newLink.type_id - }] - } - }); - - const {data: [{logInsertId}]} = deep.insert({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - from_id: logObjectId, - to_id: newLink.id, - number: {data: {value: timestamp}} - }); + code: `({deep, data: {newLink}}) => { + await deep.insert({type_id: {_id :["@deep-foundation/logger", "LogInsert"] } }); }`, - fileName: "insertHandlerFile", - handlerName: "insertHandler", - handleName: "insertHandle", + fileName: "insertHandlerFile1", + handlerName: "insertHandler1", + handleName: "insertHandle1", handleOperationTypeId: handleInsertTypeId, supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId, + triggerTypeId: debugLogTypeId, containTypeId, deep, fileTypeId: syncTextFileTypeId, @@ -235,167 +232,221 @@ const installPackage = async () => { packageId } ); - console.log({ insertHandlerId }); + console.log({ insertHandlerId1 }); - const updateHandlerId = await insertHandler( - { - code: `({deep, data: {newLink}}) => { - const timestamp = Date.now(); + await deep.insert({ + type_id: debugLogTypeId + }); + + await sleep(3000); + + const {data: [link]} =await deep.select({ + type_id: debugLogTypeId + }); + + console.log(link); + + // const insertHandlerId = await insertHandler( + // { + // code: `({deep, data: {newLink}}) => { + // deep.insert({ + // type_id: {_id: ["@deep-foundation/logger", "DebugLog"]}, + // }) + // const timestamp = Date.now(); + + // const {data: [{logObjectId}]} = deep.insert({ + // type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, + // from_id: newLink.from_id, + // to_id: newLink.to_id, + // out: { + // data: [{ + // type_id: {_id: ["@deep-foundation/logger", "LogType"]}, + // to_id: newLink.type_id + // }] + // } + // }); + + // const {data: [{logInsertId}]} = deep.insert({ + // type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + // from_id: logObjectId, + // to_id: newLink.id, + // number: {data: {value: timestamp}} + // }); + // }`, + // fileName: "insertHandlerFile", + // handlerName: "insertHandler", + // handleName: "insertHandle", + // handleOperationTypeId: handleInsertTypeId, + // supportsId: plv8SupportsJsId, + // triggerTypeId: anyTypeId, + // containTypeId, + // deep, + // fileTypeId: syncTextFileTypeId, + // handlerTypeId, + // packageId + // } + // ); + // console.log({ insertHandlerId }); + + // const updateHandlerId = await insertHandler( + // { + // code: `({deep, data: {newLink}}) => { + // const timestamp = Date.now(); - const {data: [{id: logInsertId}]} = deep.select({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - to_id: newLink.id - }) + // const {data: [{id: logInsertId}]} = deep.select({ + // type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + // to_id: newLink.id + // }) - deep.update({ - type_id: {_id: ["@deep-foundation/logger", "LogUpdate"]}, - from_id: deep.linkId, - to_id: logInsertId, - number: {data: {value: timestamp}} - }) - }`, - fileName: "updateHandlerFile", - handlerName: "updateHandler", - handleName: "updateHandle", - handleOperationTypeId: handleUpdateTypeId, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId, - containTypeId, - deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, - packageId, - } - ); - console.log({ updateHandlerId }); - - const deleteHandlerId = await insertHandler( - { - code: `({deep, data: {newLink}}) => { - const timestamp = Date.now(); + // deep.update({ + // type_id: {_id: ["@deep-foundation/logger", "LogUpdate"]}, + // from_id: deep.linkId, + // to_id: logInsertId, + // number: {data: {value: timestamp}} + // }) + // }`, + // fileName: "updateHandlerFile", + // handlerName: "updateHandler", + // handleName: "updateHandle", + // handleOperationTypeId: handleUpdateTypeId, + // supportsId: plv8SupportsJsId, + // triggerTypeId: anyTypeId, + // containTypeId, + // deep, + // fileTypeId: syncTextFileTypeId, + // handlerTypeId, + // packageId, + // } + // ); + // console.log({ updateHandlerId }); + + // const deleteHandlerId = await insertHandler( + // { + // code: `({deep, data: {newLink}}) => { + // const timestamp = Date.now(); - const {data: [{id: logInsertId}]} = deep.select({ - type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - to_id: newLink.id - }) + // const {data: [{id: logInsertId}]} = deep.select({ + // type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, + // to_id: newLink.id + // }) - deep.delete({ - type_id: {_id: ["@deep-foundation/logger", "LogDelete"]}, - from_id: deep.linkId, - to_id: logInsertId, - number: {data: {value: timestamp}} - }) - }`, - fileName: "deleteHandlerFile", - handlerName: "deleteHandler", - handleName: "deleteHandle", - handleOperationTypeId: handleDeleteTypeId, - supportsId: plv8SupportsJsId, - triggerTypeId: anyTypeId, - containTypeId, - deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, - packageId - } - ); - console.log({ deleteHandlerId }); - - const callTests = async () => { - const {data: [{id: customTypeId}]} = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId - }); - - const {data: [{id: linkId}]} = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId - }); - - var logInsertId; - for (let i = 0; i < 10; i++) { - const {data}= await deep.select({ - type_id: logInsertTypeId, - to_id: linkId - }); - if(data.length > 0) { - logInsertId = data[0].id; - break; - } - await sleep(1000); - } - expect(logInsertId).to.not.be.equal(undefined); - - var logObjectId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logObjectTypeId, - from_id: linkId.from_id, - to_id: linkId.to_id - }); - if(data.length > 0) { - logObjectId = data[0].id; - break; - } - await sleep(1000); - } - expect(logObjectId).to.not.be.equal(undefined); - - var logTypeId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logTypeTypeId, - from_id: logObjectId, - to_id: customTypeId - }); - if(data.length > 0) { - logTypeId = data[0].id; - break; - } - await sleep(1000); - } - expect(logTypeId).to.not.be.equal(undefined); - - await deep.insert({link_id: linkId, value: "string"}, {table: "strings"}); - - var logUpdateId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logUpdateTypeId, - from_id: deep.linkId, - to_id: logInsertId - }); - if(data.length > 0) { - logUpdateId = data[0].id; - break; - } - await sleep(1000); - } - expect(logUpdateId).to.not.be.equal(undefined); - - await deep.delete({ - id: linkId - }); - - var logDeleteId; - for (let i = 0; i < 10; i++) { - const {data} = await deep.select({ - type_id: logDeleteTypeId, - from_id: deep.linkId, - to_id: logInsertId - }); - if(data.length > 0) { - logDeleteId = data[0].id; - break; - } - await sleep(1000); - } - expect(logDeleteId).to.not.be.equal(undefined); - } + // deep.delete({ + // type_id: {_id: ["@deep-foundation/logger", "LogDelete"]}, + // from_id: deep.linkId, + // to_id: logInsertId, + // number: {data: {value: timestamp}} + // }) + // }`, + // fileName: "deleteHandlerFile", + // handlerName: "deleteHandler", + // handleName: "deleteHandle", + // handleOperationTypeId: handleDeleteTypeId, + // supportsId: plv8SupportsJsId, + // triggerTypeId: anyTypeId, + // containTypeId, + // deep, + // fileTypeId: syncTextFileTypeId, + // handlerTypeId, + // packageId + // } + // ); + // console.log({ deleteHandlerId }); + + // const callTests = async () => { + // const {data: [{id: customTypeId}]} = await deep.insert({ + // type_id: typeTypeId, + // from_id: anyTypeId, + // to_id: anyTypeId + // }); + + // const {data: [{id: linkId}]} = await deep.insert({ + // type_id: typeTypeId, + // from_id: anyTypeId, + // to_id: anyTypeId + // }); + + // var logInsertId; + // for (let i = 0; i < 10; i++) { + // const {data}= await deep.select({ + // type_id: logInsertTypeId, + // to_id: linkId + // }); + // if(data.length > 0) { + // logInsertId = data[0].id; + // break; + // } + // await sleep(1000); + // } + // expect(logInsertId).to.not.be.equal(undefined); + + // var logObjectId; + // for (let i = 0; i < 10; i++) { + // const {data} = await deep.select({ + // type_id: logObjectTypeId, + // from_id: linkId.from_id, + // to_id: linkId.to_id + // }); + // if(data.length > 0) { + // logObjectId = data[0].id; + // break; + // } + // await sleep(1000); + // } + // expect(logObjectId).to.not.be.equal(undefined); + + // var logTypeId; + // for (let i = 0; i < 10; i++) { + // const {data} = await deep.select({ + // type_id: logTypeTypeId, + // from_id: logObjectId, + // to_id: customTypeId + // }); + // if(data.length > 0) { + // logTypeId = data[0].id; + // break; + // } + // await sleep(1000); + // } + // expect(logTypeId).to.not.be.equal(undefined); + + // await deep.insert({link_id: linkId, value: "string"}, {table: "strings"}); + + // var logUpdateId; + // for (let i = 0; i < 10; i++) { + // const {data} = await deep.select({ + // type_id: logUpdateTypeId, + // from_id: deep.linkId, + // to_id: logInsertId + // }); + // if(data.length > 0) { + // logUpdateId = data[0].id; + // break; + // } + // await sleep(1000); + // } + // expect(logUpdateId).to.not.be.equal(undefined); + + // await deep.delete({ + // id: linkId + // }); + + // var logDeleteId; + // for (let i = 0; i < 10; i++) { + // const {data} = await deep.select({ + // type_id: logDeleteTypeId, + // from_id: deep.linkId, + // to_id: logInsertId + // }); + // if(data.length > 0) { + // logDeleteId = data[0].id; + // break; + // } + // await sleep(1000); + // } + // expect(logDeleteId).to.not.be.equal(undefined); + // } - await callTests(); + // await callTests(); }; installPackage(); From aff4e5423a450effbdfa879798691d39609e7b1e Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sun, 30 Oct 2022 10:19:16 +0000 Subject: [PATCH 24/51] Remove unused code --- logger.cjs | 1 - 1 file changed, 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index 0b57543a..ffb510d9 100644 --- a/logger.cjs +++ b/logger.cjs @@ -10,7 +10,6 @@ const { minilinks, Link, } = require('@deep-foundation/deeplinks/imports/minilinks'); -const puppeteer = require('puppeteer'); const crypto = require('crypto'); const axios = require('axios'); const uniqid = require('uniqid'); From 19d34f2b2496eb8ccd25664d2570205e95749530 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sun, 30 Oct 2022 10:21:07 +0000 Subject: [PATCH 25/51] Install dotenv-expand --- package-lock.json | 32 +++++++++++++++++++++++++++++++- package.json | 1 + 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 3d42eb84..8e1671e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2203,6 +2203,15 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "body-parser": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", @@ -3070,6 +3079,11 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz", "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==" }, + "dotenv-expand": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-9.0.0.tgz", + "integrity": "sha512-uW8Hrhp5ammm9x7kBLR6jDfujgaDarNA02tprvZdyrJ7MpdzD1KyrIHG4l+YoC2fJ2UcdFdNWNWIjt+sexBHJw==" + }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -3568,6 +3582,12 @@ "reusify": "^1.0.4" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -4111,7 +4131,11 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", @@ -5999,6 +6023,12 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "nan": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", + "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", diff --git a/package.json b/package.json index f1ec95fb..8661fe70 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "concurrently": "^5.3.0", "cross-env": "^7.0.3", "del": "^6.0.0", + "dotenv-expand": "^9.0.0", "gulp": "^4.0.2", "gulp-run-command": "^0.0.10", "i": "^0.3.6", From c14d587c8b2767cf1c19339140909ce24ab9c747 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Mon, 28 Nov 2022 07:11:37 +0000 Subject: [PATCH 26/51] Update draft --- logger.cjs | 874 ++++++++++++++++++++++++++++------------------------- 1 file changed, 464 insertions(+), 410 deletions(-) diff --git a/logger.cjs b/logger.cjs index ffb510d9..899f4dda 100644 --- a/logger.cjs +++ b/logger.cjs @@ -15,9 +15,9 @@ const axios = require('axios'); const uniqid = require('uniqid'); const { expect } = require('chai'); const { get } = require('lodash'); -const {default: links} = require('@deep-foundation/deeplinks/imports/router/links'); -const {insertHandler} = require('./deep-packages/insertHandler.cjs'); -const {sleep} = require('./deep-packages/sleep.cjs'); +const { default: links } = require('@deep-foundation/deeplinks/imports/router/links'); +const { insertHandler } = require('./deep-packages/insertHandler.cjs'); +const { sleep } = require('./deep-packages/sleep.cjs'); var myEnv = dotenv.config(); dotenvExpand.expand(myEnv); @@ -25,427 +25,481 @@ dotenvExpand.expand(myEnv); console.log('Installing logger package'); -const allCreatedLinkIds = []; +const createdLinkIds = []; -const installPackage = async () => { - const apolloClient = generateApolloClient({ - path: process.env.NEXT_PUBLIC_GQL_PATH || '', // <<= HERE PATH TO UPDATE - ssl: !!~process.env.NEXT_PUBLIC_GQL_PATH.indexOf('localhost') - ? false - : true, - // admin token in prealpha deep secret key - // token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibGluayJdLCJ4LWhhc3VyYS1kZWZhdWx0LXJvbGUiOiJsaW5rIiwieC1oYXN1cmEtdXNlci1pZCI6IjI2MiJ9LCJpYXQiOjE2NTYxMzYyMTl9.dmyWwtQu9GLdS7ClSLxcXgQiKxmaG-JPDjQVxRXOpxs', - }); - - const unloginedDeep = new DeepClient({ apolloClient }); - const guest = await unloginedDeep.guest(); - const guestDeep = new DeepClient({ deep: unloginedDeep, ...guest }); - const admin = await guestDeep.login({ - linkId: await guestDeep.id('deep', 'admin'), - }); - const deep = new DeepClient({ deep: guestDeep, ...admin }); - - const dockerSupportsJs = await deep.id( - '@deep-foundation/core', - 'dockerSupportsJs' - ); - const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); - const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); - const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); - const portTypeId = await deep.id('@deep-foundation/core', 'Port'); - const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); - const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); - const routerStringUseTypeId = await deep.id( - '@deep-foundation/core', - 'RouterStringUse' - ); - const routeTypeId = await deep.id('@deep-foundation/core', 'Route'); - const handleRouteTypeId = await deep.id( - '@deep-foundation/core', - 'HandleRoute' - ); - const handlerTypeId = await deep.id( - '@deep-foundation/core', - 'Handler' - ); - const dockerSupportsJsId = await deep.id( - '@deep-foundation/core', - 'dockerSupportsJs' - ); - - const treeTypeId = await deep.id('@deep-foundation/core', 'Tree'); - const treeIncludeNodeTypeId = await deep.id( - '@deep-foundation/core', - 'TreeIncludeNode' - ); - const treeIncludeUpTypeId = await deep.id('@deep-foundation/core', 'TreeIncludeUp'); - const treeIncludeDownTypeId = await deep.id( - '@deep-foundation/core', - 'TreeIncludeDown' - ); - - const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); - const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); - const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); - const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); - const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); - const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); - const plv8SupportsJsId = await deep.id('@deep-foundation/core','plv8SupportsJs'); +const main = async () => { - const { data: [{ id: packageId }] } = await deep.insert({ - type_id: packageTypeId, - string: { data: { value: `@deep-foundation/logger` } }, - in: { data: [ - { - type_id: containTypeId, - from_id: deep.linkId - }, - ] }, - out: { data: [ - { - type_id: joinTypeId, - to_id: await deep.id('deep', 'users', 'packages'), + const installPackage = async () => { + const apolloClient = generateApolloClient({ + path: process.env.NEXT_PUBLIC_GQL_PATH || '', // <<= HERE PATH TO UPDATE + ssl: !!~process.env.NEXT_PUBLIC_GQL_PATH.indexOf('localhost') + ? false + : true, + // admin token in prealpha deep secret key + // token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibGluayJdLCJ4LWhhc3VyYS1kZWZhdWx0LXJvbGUiOiJsaW5rIiwieC1oYXN1cmEtdXNlci1pZCI6IjI2MiJ9LCJpYXQiOjE2NTYxMzYyMTl9.dmyWwtQu9GLdS7ClSLxcXgQiKxmaG-JPDjQVxRXOpxs', + }); + + const unloginedDeep = new DeepClient({ apolloClient }); + const guest = await unloginedDeep.guest(); + const guestDeep = new DeepClient({ deep: unloginedDeep, ...guest }); + const admin = await guestDeep.login({ + linkId: await guestDeep.id('deep', 'admin'), + }); + const deep = new DeepClient({ deep: guestDeep, ...admin }); + + const dockerSupportsJs = await deep.id( + '@deep-foundation/core', + 'dockerSupportsJs' + ); + const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); + const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); + const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); + const portTypeId = await deep.id('@deep-foundation/core', 'Port'); + const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); + const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); + const routerStringUseTypeId = await deep.id( + '@deep-foundation/core', + 'RouterStringUse' + ); + const routeTypeId = await deep.id('@deep-foundation/core', 'Route'); + const handleRouteTypeId = await deep.id( + '@deep-foundation/core', + 'HandleRoute' + ); + const handlerTypeId = await deep.id( + '@deep-foundation/core', + 'Handler' + ); + const dockerSupportsJsId = await deep.id( + '@deep-foundation/core', + 'dockerSupportsJs' + ); + + const treeTypeId = await deep.id('@deep-foundation/core', 'Tree'); + const treeIncludeNodeTypeId = await deep.id( + '@deep-foundation/core', + 'TreeIncludeNode' + ); + const treeIncludeUpTypeId = await deep.id('@deep-foundation/core', 'TreeIncludeUp'); + const treeIncludeDownTypeId = await deep.id( + '@deep-foundation/core', + 'TreeIncludeDown' + ); + + const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); + const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); + const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); + const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); + const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); + const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); + const plv8SupportsJsId = await deep.id('@deep-foundation/core', 'plv8SupportsJs'); + + + const { data: [{ id: packageId }] } = await deep.insert({ + type_id: packageTypeId, + string: { data: { value: `@deep-foundation/logger` } }, + in: { + data: [ + { + type_id: containTypeId, + from_id: deep.linkId + }, + ] }, - { - type_id: joinTypeId, - to_id: await deep.id('deep', 'admin'), + out: { + data: [ + { + type_id: joinTypeId, + to_id: await deep.id('deep', 'users', 'packages'), + }, + { + type_id: joinTypeId, + to_id: await deep.id('deep', 'admin'), + }, + ] }, - ] }, - }); + }); - console.log({ packageId }); - - const { - data: [{ id: logInsertTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogInsert' } }, + console.log({ packageId }); + + // Only for development until handlers will handlle "any" as trigger to handle links of all types + const { + data: [{ id: triggerTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'TriggerTypeId' } }, + }, }, - }, - }); - console.log({ logInsertTypeId }); - - const { - data: [{ id: debugLogTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'DebugLog' } }, + }); + console.log({ triggerTypeId }); + + const { + data: [{ id: logInsertTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogInsert' } }, + }, }, - }, - }); - console.log({ debugLog: debugLogTypeId }); - - const { - data: [{ id: logUpdateTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogUpdate' } }, + }); + console.log({ logInsertTypeId }); + + const { + data: [{ id: logUpdateTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogUpdate' } }, + }, }, - }, - }); - console.log({ logUpdateTypeId }); - - const { - data: [{ id: logDeleteTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogDelete' } }, + }); + console.log({ logUpdateTypeId }); + + const { + data: [{ id: logDeleteTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogDelete' } }, + }, }, - }, - }); - console.log({ logDeleteTypeId }); - - const { - data: [{ id: logTypeTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogType' } }, + }); + console.log({ logDeleteTypeId }); + + const { + data: [{ id: logTypeTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogType' } }, + }, }, - }, - }); - console.log({ logTypeTypeId }); - - const { - data: [{ id: logObjectTypeId }], - } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, - in: { - data: { - type_id: containTypeId, - from_id: packageId, // before created package - string: { data: { value: 'LogObject' } }, + }); + console.log({ logTypeTypeId }); + + const { + data: [{ id: logObjectTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogObject' } }, + }, }, - }, - }); - console.log({ logObjectTypeId }); - - const insertHandlerId1 = await insertHandler( - { - code: `({deep, data: {newLink}}) => { - await deep.insert({type_id: {_id :["@deep-foundation/logger", "LogInsert"] } }); - }`, - fileName: "insertHandlerFile1", - handlerName: "insertHandler1", - handleName: "insertHandle1", - handleOperationTypeId: handleInsertTypeId, - supportsId: plv8SupportsJsId, - triggerTypeId: debugLogTypeId, - containTypeId, - deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, - packageId + }); + console.log({ logObjectTypeId }); + + // const insertHandlerId = await insertHandler( + // { + // code: `({deep, data: {newLink}}) => { + // const timestamp = Date.now(); + + // const logObjectTypeId = deep.id("@deep-foundation/logger", "LogObject"); + // const logTypeTypeId = deep.id("@deep-foundation/logger", "LogType"); + + // const {data: [{logObjectId}]} = deep.insert({ + // type_id: logObjectTypeId, + // from_id: newLink.from_id, + // to_id: newLink.to_id, + // out: { + // data: [{ + // type_id: logTypeTypeId, + // to_id: newLink.type_id + // }] + // } + // }); + // const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); + // const {data: [{logInsertId}]} = deep.insert({ + // type_id: logInsertTypeId, + // number: timestamp + // }); + // }`, + // fileName: "insertHandlerFile", + // handlerName: "insertHandler", + // handleName: "insertHandle", + // handleOperationTypeId: handleInsertTypeId, + // supportsId: plv8SupportsJsId, + // triggerTypeId: /*TODO: anyTypeId*/ triggerTypeId, + // containTypeId, + // deep, + // fileTypeId: syncTextFileTypeId, + // handlerTypeId, + // packageId + // } + // ); + // console.log({ insertHandlerId }); + + // await deep.insert({ + // type_id: triggerTypeId + // }) + + // await sleep(5000); + + // const {data} =await deep.select({ + // type_id: logInsertTypeId + // }) + // console.log({data}); + + const insertHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const logObjectTypeId = deep.id("@deep-foundation/logger", "LogObject"); + const logTypeTypeId = deep.id("@deep-foundation/logger", "LogType"); + + /*const {data: [{logObjectId}]} = deep.insert({ + type_id: logObjectTypeId, + from_id: newLink.from_id, + to_id: newLink.to_id, + out: { + data: [{ + type_id: logTypeTypeId, + to_id: newLink.type_id + }] + } + });*/ + + const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); + + const {data: [{logInsertId}]} = deep.insert({ + type_id: logInsertTypeId, + /*from_id: logObjectId, + to_id: newLink.id,*/ + string: {data: {value: timestamp}} + }); + }`, + fileName: "insertHandlerFile", + handlerName: "insertHandler", + handleName: "insertHandle", + handleOperationTypeId: handleInsertTypeId, + supportsId: plv8SupportsJsId, + triggerTypeId: /*TODO: anyTypeId*/ triggerTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId + } + ); + console.log({ insertHandlerId }); + + const updateHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); + + const {data: [{id: logInsertId}]} = deep.select({ + type_id: logInsertTypeId, + to_id: newLink.id + }) + + const logUpdateTypeId = deep.id("@deep-foundation/logger", "LogUpdate"); + + deep.update({ + type_id: logUpdateTypeId, + from_id: deep.linkId, + to_id: logInsertId, + number: timestamp + }) + }`, + fileName: "updateHandlerFile", + handlerName: "updateHandler", + handleName: "updateHandle", + handleOperationTypeId: handleUpdateTypeId, + supportsId: plv8SupportsJsId, + triggerTypeId: /* TODO: anyTypeId */ triggerTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId, + } + ); + console.log({ updateHandlerId }); + + const deleteHandlerId = await insertHandler( + { + code: `({deep, data: {newLink}}) => { + const timestamp = Date.now(); + + const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); + + const {data: [{id: logInsertId}]} = deep.select({ + type_id: logInsertTypeId, + to_id: newLink.id + }) + + const logDeleteTypeId = deep.id("@deep-foundation/logger", "LogDelete"); + + deep.insert({ + type_id: logDeleteTypeId, + from_id: deep.linkId, + to_id: logInsertId, + number: timestamp + }) + }`, + fileName: "deleteHandlerFile", + handlerName: "deleteHandler", + handleName: "deleteHandle", + handleOperationTypeId: handleDeleteTypeId, + supportsId: plv8SupportsJsId, + triggerTypeId: /* TODO: anyTypeId */ triggerTypeId, + containTypeId, + deep, + fileTypeId: syncTextFileTypeId, + handlerTypeId, + packageId + } + ); + console.log({ deleteHandlerId }); + + const createdTestLinkIds = []; + const callTests = async () => { + // const {data: [{id: customTypeId}]} = await deep.Delete({ + // type_id: typeTypeId, + // from_id: anyTypeId, + // to_id: anyTypeId + // }); + // console.log({ customTypeId }); + // createdTestLinkIds.push(customTypeId) + // createdLinkIds.push(customTypeId) + + console.log("Before linkId"); + const { data: [{ id: linkId }] } = await deep.insert({ + type_id: /* TODO: customTypeId*/ triggerTypeId, + }); + console.log({ linkId }); + createdTestLinkIds.push(linkId) + createdLinkIds.push(linkId) + + var logInsertId; + for (let i = 0; i < 10; i++) { + const { data } = await deep.select({ + type_id: logInsertTypeId, + // to_id: linkId + }); + if (data.length > 0) { + logInsertId = data[0].id; + break; + } + await sleep(1000); + } + expect(logInsertId).to.not.be.equal(undefined); + + var logObjectId; + for (let i = 0; i < 10; i++) { + const { data } = await deep.select({ + type_id: logObjectTypeId, + from_id: linkId.from_id, + to_id: linkId.to_id + }); + if (data.length > 0) { + logObjectId = data[0].id; + break; + } + await sleep(1000); + } + expect(logObjectId).to.not.be.equal(undefined); + + var logTypeId; + for (let i = 0; i < 10; i++) { + const { data } = await deep.select({ + type_id: logTypeTypeId, + from_id: logObjectId, + to_id: customTypeId + }); + if (data.length > 0) { + logTypeId = data[0].id; + break; + } + await sleep(1000); + } + expect(logTypeId).to.not.be.equal(undefined); + + await deep.insert({ link_id: linkId, value: "string" }, { table: "strings" }); + + var logUpdateId; + for (let i = 0; i < 10; i++) { + const { data } = await deep.select({ + type_id: logUpdateTypeId, + from_id: deep.linkId, + to_id: logInsertId + }); + if (data.length > 0) { + logUpdateId = data[0].id; + break; + } + await sleep(1000); + } + expect(logUpdateId).to.not.be.equal(undefined); + + await deep.delete({ + id: linkId + }); + + var logDeleteId; + for (let i = 0; i < 10; i++) { + const { data } = await deep.select({ + type_id: logDeleteTypeId, + from_id: deep.linkId, + to_id: logInsertId + }); + if (data.length > 0) { + logDeleteId = data[0].id; + break; + } + await sleep(1000); + } + expect(logDeleteId).to.not.be.equal(undefined); + } - ); - console.log({ insertHandlerId1 }); - - await deep.insert({ - type_id: debugLogTypeId - }); - - await sleep(3000); - - const {data: [link]} =await deep.select({ - type_id: debugLogTypeId + await callTests().then(() => { + deep.delete(createdTestLinkIds); + }).catch(error => { + console.error(error) + deep.delete(createdLinkIds); + }); + } + + await installPackage().catch(error => { + console.error(error) + deep.delete(createdLinkIds); }); - - console.log(link); - - // const insertHandlerId = await insertHandler( - // { - // code: `({deep, data: {newLink}}) => { - // deep.insert({ - // type_id: {_id: ["@deep-foundation/logger", "DebugLog"]}, - // }) - // const timestamp = Date.now(); - - // const {data: [{logObjectId}]} = deep.insert({ - // type_id: {_id: ["@deep-foundation/logger", "LogObject"]}, - // from_id: newLink.from_id, - // to_id: newLink.to_id, - // out: { - // data: [{ - // type_id: {_id: ["@deep-foundation/logger", "LogType"]}, - // to_id: newLink.type_id - // }] - // } - // }); - - // const {data: [{logInsertId}]} = deep.insert({ - // type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - // from_id: logObjectId, - // to_id: newLink.id, - // number: {data: {value: timestamp}} - // }); - // }`, - // fileName: "insertHandlerFile", - // handlerName: "insertHandler", - // handleName: "insertHandle", - // handleOperationTypeId: handleInsertTypeId, - // supportsId: plv8SupportsJsId, - // triggerTypeId: anyTypeId, - // containTypeId, - // deep, - // fileTypeId: syncTextFileTypeId, - // handlerTypeId, - // packageId - // } - // ); - // console.log({ insertHandlerId }); - - // const updateHandlerId = await insertHandler( - // { - // code: `({deep, data: {newLink}}) => { - // const timestamp = Date.now(); - - // const {data: [{id: logInsertId}]} = deep.select({ - // type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - // to_id: newLink.id - // }) - - // deep.update({ - // type_id: {_id: ["@deep-foundation/logger", "LogUpdate"]}, - // from_id: deep.linkId, - // to_id: logInsertId, - // number: {data: {value: timestamp}} - // }) - // }`, - // fileName: "updateHandlerFile", - // handlerName: "updateHandler", - // handleName: "updateHandle", - // handleOperationTypeId: handleUpdateTypeId, - // supportsId: plv8SupportsJsId, - // triggerTypeId: anyTypeId, - // containTypeId, - // deep, - // fileTypeId: syncTextFileTypeId, - // handlerTypeId, - // packageId, - // } - // ); - // console.log({ updateHandlerId }); - - // const deleteHandlerId = await insertHandler( - // { - // code: `({deep, data: {newLink}}) => { - // const timestamp = Date.now(); - - // const {data: [{id: logInsertId}]} = deep.select({ - // type_id: {_id: ["@deep-foundation/logger", "LogInsert"]}, - // to_id: newLink.id - // }) - - // deep.delete({ - // type_id: {_id: ["@deep-foundation/logger", "LogDelete"]}, - // from_id: deep.linkId, - // to_id: logInsertId, - // number: {data: {value: timestamp}} - // }) - // }`, - // fileName: "deleteHandlerFile", - // handlerName: "deleteHandler", - // handleName: "deleteHandle", - // handleOperationTypeId: handleDeleteTypeId, - // supportsId: plv8SupportsJsId, - // triggerTypeId: anyTypeId, - // containTypeId, - // deep, - // fileTypeId: syncTextFileTypeId, - // handlerTypeId, - // packageId - // } - // ); - // console.log({ deleteHandlerId }); - - // const callTests = async () => { - // const {data: [{id: customTypeId}]} = await deep.insert({ - // type_id: typeTypeId, - // from_id: anyTypeId, - // to_id: anyTypeId - // }); - - // const {data: [{id: linkId}]} = await deep.insert({ - // type_id: typeTypeId, - // from_id: anyTypeId, - // to_id: anyTypeId - // }); - - // var logInsertId; - // for (let i = 0; i < 10; i++) { - // const {data}= await deep.select({ - // type_id: logInsertTypeId, - // to_id: linkId - // }); - // if(data.length > 0) { - // logInsertId = data[0].id; - // break; - // } - // await sleep(1000); - // } - // expect(logInsertId).to.not.be.equal(undefined); - - // var logObjectId; - // for (let i = 0; i < 10; i++) { - // const {data} = await deep.select({ - // type_id: logObjectTypeId, - // from_id: linkId.from_id, - // to_id: linkId.to_id - // }); - // if(data.length > 0) { - // logObjectId = data[0].id; - // break; - // } - // await sleep(1000); - // } - // expect(logObjectId).to.not.be.equal(undefined); - - // var logTypeId; - // for (let i = 0; i < 10; i++) { - // const {data} = await deep.select({ - // type_id: logTypeTypeId, - // from_id: logObjectId, - // to_id: customTypeId - // }); - // if(data.length > 0) { - // logTypeId = data[0].id; - // break; - // } - // await sleep(1000); - // } - // expect(logTypeId).to.not.be.equal(undefined); - - // await deep.insert({link_id: linkId, value: "string"}, {table: "strings"}); - - // var logUpdateId; - // for (let i = 0; i < 10; i++) { - // const {data} = await deep.select({ - // type_id: logUpdateTypeId, - // from_id: deep.linkId, - // to_id: logInsertId - // }); - // if(data.length > 0) { - // logUpdateId = data[0].id; - // break; - // } - // await sleep(1000); - // } - // expect(logUpdateId).to.not.be.equal(undefined); - - // await deep.delete({ - // id: linkId - // }); - - // var logDeleteId; - // for (let i = 0; i < 10; i++) { - // const {data} = await deep.select({ - // type_id: logDeleteTypeId, - // from_id: deep.linkId, - // to_id: logInsertId - // }); - // if(data.length > 0) { - // logDeleteId = data[0].id; - // break; - // } - // await sleep(1000); - // } - // expect(logDeleteId).to.not.be.equal(undefined); - // } - - // await callTests(); }; -installPackage(); +main(); From db4a1dc2029482643d2d49621a16ca8e316f7096 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Wed, 30 Nov 2022 17:19:55 +0000 Subject: [PATCH 27/51] Make Insert handler workable, fix typos --- logger.cjs | 98 +++++++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/logger.cjs b/logger.cjs index 899f4dda..1848c36a 100644 --- a/logger.cjs +++ b/logger.cjs @@ -135,7 +135,7 @@ const main = async () => { data: { type_id: containTypeId, from_id: packageId, // before created package - string: { data: { value: 'TriggerTypeId' } }, + string: { data: { value: 'Trigger' } }, }, }, }); @@ -276,28 +276,33 @@ const main = async () => { { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); + + const logObjectInsertData = { + type_id: deep.id("@deep-foundation/logger", "LogObject"), + ...(newLink.from_id && {from_id: newLink.from_id}), + ...(newLink.to_id && {to_id: newLink.to_id}), + }; + /*logObjectInsertData: {"type_id":"719"}*/ + + /*throw new Error("logObjectInsertData: " + JSON.stringify(logObjectInsertData, (key, value) => + typeof value === 'bigint' + ? value.toString() + : value // return everything else unchanged + ));*/ + const {data: [{id: logObjectId}]} = deep.insert(logObjectInsertData); + /*data: [{"id":"742"}]*/ + /*logObjectId: "742"*/ + + const {data: [{id: logTypeId}]} = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogType"), + from_id: logObjectId, + to_id: newLink.type_id + }); - const logObjectTypeId = deep.id("@deep-foundation/logger", "LogObject"); - const logTypeTypeId = deep.id("@deep-foundation/logger", "LogType"); - - /*const {data: [{logObjectId}]} = deep.insert({ - type_id: logObjectTypeId, - from_id: newLink.from_id, - to_id: newLink.to_id, - out: { - data: [{ - type_id: logTypeTypeId, - to_id: newLink.type_id - }] - } - });*/ - - const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); - - const {data: [{logInsertId}]} = deep.insert({ - type_id: logInsertTypeId, - /*from_id: logObjectId, - to_id: newLink.id,*/ + const {data: [{id: logInsertId}]} = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogInsert"), + from_id: logObjectId, + to_id: newLink.id, string: {data: {value: timestamp}} }); }`, @@ -320,22 +325,24 @@ const main = async () => { { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); - - const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); const {data: [{id: logInsertId}]} = deep.select({ - type_id: logInsertTypeId, + type_id: deep.id("@deep-foundation/logger", "LogInsert"), to_id: newLink.id - }) - - const logUpdateTypeId = deep.id("@deep-foundation/logger", "LogUpdate"); + }); + + throw new Error("deep: " + JSON.stringify(deep, (key, value) => + typeof value === 'bigint' + ? value.toString() + : value // return everything else unchanged + )); - deep.update({ - type_id: logUpdateTypeId, - from_id: deep.linkId, + deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogUpdate"), + from_id: deep.link_id, to_id: logInsertId, number: timestamp - }) + }); }`, fileName: "updateHandlerFile", handlerName: "updateHandler", @@ -356,18 +363,14 @@ const main = async () => { { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); - - const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); const {data: [{id: logInsertId}]} = deep.select({ - type_id: logInsertTypeId, + type_id: deep.id("@deep-foundation/logger", "LogInsert"), to_id: newLink.id }) - - const logDeleteTypeId = deep.id("@deep-foundation/logger", "LogDelete"); deep.insert({ - type_id: logDeleteTypeId, + type_id: deep.id("@deep-foundation/logger", "LogDelete"), from_id: deep.linkId, to_id: logInsertId, number: timestamp @@ -390,7 +393,7 @@ const main = async () => { const createdTestLinkIds = []; const callTests = async () => { - // const {data: [{id: customTypeId}]} = await deep.Delete({ + // TODO: const {data: [{id: customTypeId}]} = await deep.Delete({ // type_id: typeTypeId, // from_id: anyTypeId, // to_id: anyTypeId @@ -399,7 +402,6 @@ const main = async () => { // createdTestLinkIds.push(customTypeId) // createdLinkIds.push(customTypeId) - console.log("Before linkId"); const { data: [{ id: linkId }] } = await deep.insert({ type_id: /* TODO: customTypeId*/ triggerTypeId, }); @@ -411,7 +413,7 @@ const main = async () => { for (let i = 0; i < 10; i++) { const { data } = await deep.select({ type_id: logInsertTypeId, - // to_id: linkId + to_id: linkId }); if (data.length > 0) { logInsertId = data[0].id; @@ -419,6 +421,7 @@ const main = async () => { } await sleep(1000); } + console.log({logInsertId}); expect(logInsertId).to.not.be.equal(undefined); var logObjectId; @@ -434,6 +437,7 @@ const main = async () => { } await sleep(1000); } + console.log({logObjectId}); expect(logObjectId).to.not.be.equal(undefined); var logTypeId; @@ -441,7 +445,7 @@ const main = async () => { const { data } = await deep.select({ type_id: logTypeTypeId, from_id: logObjectId, - to_id: customTypeId + to_id: /*customTypeId*/ triggerTypeId }); if (data.length > 0) { logTypeId = data[0].id; @@ -449,9 +453,11 @@ const main = async () => { } await sleep(1000); } + console.log({logTypeId}); expect(logTypeId).to.not.be.equal(undefined); await deep.insert({ link_id: linkId, value: "string" }, { table: "strings" }); + var logUpdateId; for (let i = 0; i < 10; i++) { @@ -489,16 +495,16 @@ const main = async () => { } await callTests().then(() => { - deep.delete(createdTestLinkIds); - }).catch(error => { + // TODO: deep.delete(createdTestLinkIds); + }, error => { console.error(error) - deep.delete(createdLinkIds); + // TODO: deep.delete(createdLinkIds); }); } await installPackage().catch(error => { console.error(error) - deep.delete(createdLinkIds); + // TODO: deep.delete(createdLinkIds); }); }; From 9683e59ef94256b9bfe53bf7e7889d488a45f498 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 8 Dec 2022 05:43:21 +0000 Subject: [PATCH 28/51] Make logger workable --- logger.cjs | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/logger.cjs b/logger.cjs index 1848c36a..6e31b859 100644 --- a/logger.cjs +++ b/logger.cjs @@ -282,16 +282,9 @@ const main = async () => { ...(newLink.from_id && {from_id: newLink.from_id}), ...(newLink.to_id && {to_id: newLink.to_id}), }; - /*logObjectInsertData: {"type_id":"719"}*/ - /*throw new Error("logObjectInsertData: " + JSON.stringify(logObjectInsertData, (key, value) => - typeof value === 'bigint' - ? value.toString() - : value // return everything else unchanged - ));*/ - const {data: [{id: logObjectId}]} = deep.insert(logObjectInsertData); - /*data: [{"id":"742"}]*/ - /*logObjectId: "742"*/ + + const {data: [{id: logObjectId}]} = deep.insert(logObjectInsertData); const {data: [{id: logTypeId}]} = deep.insert({ type_id: deep.id("@deep-foundation/logger", "LogType"), @@ -304,7 +297,7 @@ const main = async () => { from_id: logObjectId, to_id: newLink.id, string: {data: {value: timestamp}} - }); + }); }`, fileName: "insertHandlerFile", handlerName: "insertHandler", @@ -323,23 +316,17 @@ const main = async () => { const updateHandlerId = await insertHandler( { - code: `({deep, data: {newLink}}) => { + code: `({deep, data: {newLink, triggeredByLinkId}}) => { const timestamp = Date.now(); - + const {data: [{id: logInsertId}]} = deep.select({ type_id: deep.id("@deep-foundation/logger", "LogInsert"), to_id: newLink.id }); - - throw new Error("deep: " + JSON.stringify(deep, (key, value) => - typeof value === 'bigint' - ? value.toString() - : value // return everything else unchanged - )); deep.insert({ type_id: deep.id("@deep-foundation/logger", "LogUpdate"), - from_id: deep.link_id, + from_id: triggeredByLinkId, to_id: logInsertId, number: timestamp }); @@ -361,17 +348,17 @@ const main = async () => { const deleteHandlerId = await insertHandler( { - code: `({deep, data: {newLink}}) => { + code: `({deep, data: {oldLink, triggeredByLinkId}}) => { const timestamp = Date.now(); const {data: [{id: logInsertId}]} = deep.select({ type_id: deep.id("@deep-foundation/logger", "LogInsert"), - to_id: newLink.id + to_id: oldLink.id }) deep.insert({ type_id: deep.id("@deep-foundation/logger", "LogDelete"), - from_id: deep.linkId, + from_id: triggeredByLinkId, to_id: logInsertId, number: timestamp }) @@ -457,7 +444,6 @@ const main = async () => { expect(logTypeId).to.not.be.equal(undefined); await deep.insert({ link_id: linkId, value: "string" }, { table: "strings" }); - var logUpdateId; for (let i = 0; i < 10; i++) { @@ -472,6 +458,7 @@ const main = async () => { } await sleep(1000); } + console.log({logUpdateId}); expect(logUpdateId).to.not.be.equal(undefined); await deep.delete({ @@ -491,6 +478,7 @@ const main = async () => { } await sleep(1000); } + console.log({logDeleteId}); expect(logDeleteId).to.not.be.equal(undefined); } From f60799e57c255a1d8866707648a9b3b84c1a3a5c Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 8 Dec 2022 05:44:32 +0000 Subject: [PATCH 29/51] Remove unused code --- logger.cjs | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/logger.cjs b/logger.cjs index 6e31b859..47237461 100644 --- a/logger.cjs +++ b/logger.cjs @@ -27,8 +27,6 @@ console.log('Installing logger package'); const createdLinkIds = []; - - const main = async () => { const installPackage = async () => { @@ -56,37 +54,6 @@ const main = async () => { const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); - const portTypeId = await deep.id('@deep-foundation/core', 'Port'); - const routerListeningTypeId = await deep.id('@deep-foundation/core', 'RouterListening'); - const routerTypeId = await deep.id('@deep-foundation/core', 'Router'); - const routerStringUseTypeId = await deep.id( - '@deep-foundation/core', - 'RouterStringUse' - ); - const routeTypeId = await deep.id('@deep-foundation/core', 'Route'); - const handleRouteTypeId = await deep.id( - '@deep-foundation/core', - 'HandleRoute' - ); - const handlerTypeId = await deep.id( - '@deep-foundation/core', - 'Handler' - ); - const dockerSupportsJsId = await deep.id( - '@deep-foundation/core', - 'dockerSupportsJs' - ); - - const treeTypeId = await deep.id('@deep-foundation/core', 'Tree'); - const treeIncludeNodeTypeId = await deep.id( - '@deep-foundation/core', - 'TreeIncludeNode' - ); - const treeIncludeUpTypeId = await deep.id('@deep-foundation/core', 'TreeIncludeUp'); - const treeIncludeDownTypeId = await deep.id( - '@deep-foundation/core', - 'TreeIncludeDown' - ); const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); From 4e8e22097ddcb21e530bc04c8f9395c5e532492d Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 8 Dec 2022 05:44:38 +0000 Subject: [PATCH 30/51] Format --- .../tinkoff/tests/integration/testInit.cjs | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 deep-packages/payments/tinkoff/tests/integration/testInit.cjs diff --git a/deep-packages/payments/tinkoff/tests/integration/testInit.cjs b/deep-packages/payments/tinkoff/tests/integration/testInit.cjs new file mode 100644 index 00000000..4d2f0b77 --- /dev/null +++ b/deep-packages/payments/tinkoff/tests/integration/testInit.cjs @@ -0,0 +1,110 @@ +exports.testInit = async ({deep, paymentTypeLinkId, storageBusinessLinkId, containTypeLinkId, sumTypeLinkId, sumProviderLinkId, objectTypeLinkId, }) => { + console.log('testInit-start'); + + const createdLinkIds = []; + + const { + data: [{ id: paymentLinkId }], + } = await deep.insert({ + type_id: paymentTypeLinkId, + from_id: deep.linkId, + to_id: storageBusinessLinkId, + in: { + data: [ + { + type_id: containTypeLinkId, + from_id: deep.linkId, + }, + ], + }, + }); + console.log({ paymentLinkId }); + createdLinkIds.push(paymentLinkId); + allCreatedLinkIds.push(paymentLinkId); + + const { + data: [{ id: sumLinkId }], + } = await deep.insert({ + type_id: sumTypeLinkId, + from_id: sumProviderLinkId, + to_id: paymentLinkId, + number: { data: { value: PRICE } }, + in: { + data: [ + { + type_id: containTypeLinkId, + from_id: deep.linkId, + }, + ], + }, + }); + console.log({ sumLinkId }); + createdLinkIds.push(sumLinkId); + allCreatedLinkIds.push(sumLinkId); + + const { + data: [{ id: objectLinkId }], + } = await deep.insert({ + type_id: objectTypeLinkId, + from_id: paymentLinkId, + to_id: productLinkId, + in: { + data: [ + { + type_id: containTypeLinkId, + from_id: deep.linkId, + }, + ], + }, + }); + console.log({ objectLinkId }); + createdLinkIds.push(objectLinkId); + allCreatedLinkIds.push(objectLinkId); + + const { + data: [{ id: payLinkId }], + } = await deep.insert({ + type_id: payTypeLinkId, + from_id: deep.linkId, + to_id: sumLinkId, + in: { + data: [ + { + type_id: containTypeLinkId, + from_id: deep.linkId, + }, + ], + }, + }); + console.log({ payLinkId }); + createdLinkIds.push(payLinkId); + allCreatedLinkIds.push(payLinkId); + + var urlLinkSelectQuery; + for (let i = 0; i < 10; i++) { + urlLinkSelectQuery = await deep.select({ + type_id: urlTypeLinkId, + to_id: payLinkId, + }); + + if (urlLinkSelectQuery.data.length > 0) { + break; + } + + await sleep(1000); + } + + expect(urlLinkSelectQuery.data.length).to.greaterThan(0); + + createdLinkIds.push(urlLinkSelectQuery.data[0].id); + allCreatedLinkIds.push(urlLinkSelectQuery.data[0].id); + + const createdLinks = (await deep.select(createdLinkIds)).data; + console.log({ createdLinks }); + + console.log('testInit-end'); + + return { + createdLinks + } + }; \ No newline at end of file From 3703eb8fba02429a7bb7de9ac72f710a410e6841 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 8 Dec 2022 05:44:45 +0000 Subject: [PATCH 31/51] Revert "Format" This reverts commit 4e8e22097ddcb21e530bc04c8f9395c5e532492d. --- .../tinkoff/tests/integration/testInit.cjs | 110 ------------------ 1 file changed, 110 deletions(-) delete mode 100644 deep-packages/payments/tinkoff/tests/integration/testInit.cjs diff --git a/deep-packages/payments/tinkoff/tests/integration/testInit.cjs b/deep-packages/payments/tinkoff/tests/integration/testInit.cjs deleted file mode 100644 index 4d2f0b77..00000000 --- a/deep-packages/payments/tinkoff/tests/integration/testInit.cjs +++ /dev/null @@ -1,110 +0,0 @@ -exports.testInit = async ({deep, paymentTypeLinkId, storageBusinessLinkId, containTypeLinkId, sumTypeLinkId, sumProviderLinkId, objectTypeLinkId, }) => { - console.log('testInit-start'); - - const createdLinkIds = []; - - const { - data: [{ id: paymentLinkId }], - } = await deep.insert({ - type_id: paymentTypeLinkId, - from_id: deep.linkId, - to_id: storageBusinessLinkId, - in: { - data: [ - { - type_id: containTypeLinkId, - from_id: deep.linkId, - }, - ], - }, - }); - console.log({ paymentLinkId }); - createdLinkIds.push(paymentLinkId); - allCreatedLinkIds.push(paymentLinkId); - - const { - data: [{ id: sumLinkId }], - } = await deep.insert({ - type_id: sumTypeLinkId, - from_id: sumProviderLinkId, - to_id: paymentLinkId, - number: { data: { value: PRICE } }, - in: { - data: [ - { - type_id: containTypeLinkId, - from_id: deep.linkId, - }, - ], - }, - }); - console.log({ sumLinkId }); - createdLinkIds.push(sumLinkId); - allCreatedLinkIds.push(sumLinkId); - - const { - data: [{ id: objectLinkId }], - } = await deep.insert({ - type_id: objectTypeLinkId, - from_id: paymentLinkId, - to_id: productLinkId, - in: { - data: [ - { - type_id: containTypeLinkId, - from_id: deep.linkId, - }, - ], - }, - }); - console.log({ objectLinkId }); - createdLinkIds.push(objectLinkId); - allCreatedLinkIds.push(objectLinkId); - - const { - data: [{ id: payLinkId }], - } = await deep.insert({ - type_id: payTypeLinkId, - from_id: deep.linkId, - to_id: sumLinkId, - in: { - data: [ - { - type_id: containTypeLinkId, - from_id: deep.linkId, - }, - ], - }, - }); - console.log({ payLinkId }); - createdLinkIds.push(payLinkId); - allCreatedLinkIds.push(payLinkId); - - var urlLinkSelectQuery; - for (let i = 0; i < 10; i++) { - urlLinkSelectQuery = await deep.select({ - type_id: urlTypeLinkId, - to_id: payLinkId, - }); - - if (urlLinkSelectQuery.data.length > 0) { - break; - } - - await sleep(1000); - } - - expect(urlLinkSelectQuery.data.length).to.greaterThan(0); - - createdLinkIds.push(urlLinkSelectQuery.data[0].id); - allCreatedLinkIds.push(urlLinkSelectQuery.data[0].id); - - const createdLinks = (await deep.select(createdLinkIds)).data; - console.log({ createdLinks }); - - console.log('testInit-end'); - - return { - createdLinks - } - }; \ No newline at end of file From 0a15b881593506da689662c6a66a1d44db671333 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 8 Dec 2022 05:45:08 +0000 Subject: [PATCH 32/51] Format --- logger.cjs | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/logger.cjs b/logger.cjs index 47237461..7cc615eb 100644 --- a/logger.cjs +++ b/logger.cjs @@ -38,7 +38,7 @@ const main = async () => { // admin token in prealpha deep secret key // token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibGluayJdLCJ4LWhhc3VyYS1kZWZhdWx0LXJvbGUiOiJsaW5rIiwieC1oYXN1cmEtdXNlci1pZCI6IjI2MiJ9LCJpYXQiOjE2NTYxMzYyMTl9.dmyWwtQu9GLdS7ClSLxcXgQiKxmaG-JPDjQVxRXOpxs', }); - + const unloginedDeep = new DeepClient({ apolloClient }); const guest = await unloginedDeep.guest(); const guestDeep = new DeepClient({ deep: unloginedDeep, ...guest }); @@ -46,7 +46,7 @@ const main = async () => { linkId: await guestDeep.id('deep', 'admin'), }); const deep = new DeepClient({ deep: guestDeep, ...admin }); - + const dockerSupportsJs = await deep.id( '@deep-foundation/core', 'dockerSupportsJs' @@ -54,7 +54,7 @@ const main = async () => { const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); - + const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); @@ -62,8 +62,8 @@ const main = async () => { const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); const plv8SupportsJsId = await deep.id('@deep-foundation/core', 'plv8SupportsJs'); - - + + const { data: [{ id: packageId }] } = await deep.insert({ type_id: packageTypeId, string: { data: { value: `@deep-foundation/logger` } }, @@ -88,9 +88,9 @@ const main = async () => { ] }, }); - + console.log({ packageId }); - + // Only for development until handlers will handlle "any" as trigger to handle links of all types const { data: [{ id: triggerTypeId }], @@ -107,7 +107,7 @@ const main = async () => { }, }); console.log({ triggerTypeId }); - + const { data: [{ id: logInsertTypeId }], } = await deep.insert({ @@ -123,7 +123,7 @@ const main = async () => { }, }); console.log({ logInsertTypeId }); - + const { data: [{ id: logUpdateTypeId }], } = await deep.insert({ @@ -139,7 +139,7 @@ const main = async () => { }, }); console.log({ logUpdateTypeId }); - + const { data: [{ id: logDeleteTypeId }], } = await deep.insert({ @@ -155,7 +155,7 @@ const main = async () => { }, }); console.log({ logDeleteTypeId }); - + const { data: [{ id: logTypeTypeId }], } = await deep.insert({ @@ -171,7 +171,7 @@ const main = async () => { }, }); console.log({ logTypeTypeId }); - + const { data: [{ id: logObjectTypeId }], } = await deep.insert({ @@ -187,15 +187,15 @@ const main = async () => { }, }); console.log({ logObjectTypeId }); - + // const insertHandlerId = await insertHandler( // { // code: `({deep, data: {newLink}}) => { // const timestamp = Date.now(); - + // const logObjectTypeId = deep.id("@deep-foundation/logger", "LogObject"); // const logTypeTypeId = deep.id("@deep-foundation/logger", "LogType"); - + // const {data: [{logObjectId}]} = deep.insert({ // type_id: logObjectTypeId, // from_id: newLink.from_id, @@ -227,18 +227,18 @@ const main = async () => { // } // ); // console.log({ insertHandlerId }); - + // await deep.insert({ // type_id: triggerTypeId // }) - + // await sleep(5000); - + // const {data} =await deep.select({ // type_id: logInsertTypeId // }) // console.log({data}); - + const insertHandlerId = await insertHandler( { code: `({deep, data: {newLink}}) => { @@ -280,7 +280,7 @@ const main = async () => { } ); console.log({ insertHandlerId }); - + const updateHandlerId = await insertHandler( { code: `({deep, data: {newLink, triggeredByLinkId}}) => { @@ -312,7 +312,7 @@ const main = async () => { } ); console.log({ updateHandlerId }); - + const deleteHandlerId = await insertHandler( { code: `({deep, data: {oldLink, triggeredByLinkId}}) => { @@ -344,7 +344,7 @@ const main = async () => { } ); console.log({ deleteHandlerId }); - + const createdTestLinkIds = []; const callTests = async () => { // TODO: const {data: [{id: customTypeId}]} = await deep.Delete({ @@ -355,14 +355,14 @@ const main = async () => { // console.log({ customTypeId }); // createdTestLinkIds.push(customTypeId) // createdLinkIds.push(customTypeId) - + const { data: [{ id: linkId }] } = await deep.insert({ type_id: /* TODO: customTypeId*/ triggerTypeId, }); console.log({ linkId }); createdTestLinkIds.push(linkId) createdLinkIds.push(linkId) - + var logInsertId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ @@ -375,9 +375,9 @@ const main = async () => { } await sleep(1000); } - console.log({logInsertId}); + console.log({ logInsertId }); expect(logInsertId).to.not.be.equal(undefined); - + var logObjectId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ @@ -391,9 +391,9 @@ const main = async () => { } await sleep(1000); } - console.log({logObjectId}); + console.log({ logObjectId }); expect(logObjectId).to.not.be.equal(undefined); - + var logTypeId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ @@ -407,11 +407,11 @@ const main = async () => { } await sleep(1000); } - console.log({logTypeId}); + console.log({ logTypeId }); expect(logTypeId).to.not.be.equal(undefined); - + await deep.insert({ link_id: linkId, value: "string" }, { table: "strings" }); - + var logUpdateId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ @@ -425,13 +425,13 @@ const main = async () => { } await sleep(1000); } - console.log({logUpdateId}); + console.log({ logUpdateId }); expect(logUpdateId).to.not.be.equal(undefined); - + await deep.delete({ id: linkId }); - + var logDeleteId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ @@ -445,9 +445,9 @@ const main = async () => { } await sleep(1000); } - console.log({logDeleteId}); + console.log({ logDeleteId }); expect(logDeleteId).to.not.be.equal(undefined); - + } await callTests().then(() => { // TODO: deep.delete(createdTestLinkIds); From 666448c717f64644a2154ace13c9ae626135bbe6 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Thu, 8 Dec 2022 05:49:39 +0000 Subject: [PATCH 33/51] Store package name in the global const --- logger.cjs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/logger.cjs b/logger.cjs index 7cc615eb..763b568f 100644 --- a/logger.cjs +++ b/logger.cjs @@ -22,7 +22,9 @@ const { sleep } = require('./deep-packages/sleep.cjs'); var myEnv = dotenv.config(); dotenvExpand.expand(myEnv); -console.log('Installing logger package'); +const PACKAGE_NAME = "@deep-foundation/logger"; + +console.log(`Installing ${PACKAGE_NAME} package.`); const createdLinkIds = []; @@ -66,7 +68,7 @@ const main = async () => { const { data: [{ id: packageId }] } = await deep.insert({ type_id: packageTypeId, - string: { data: { value: `@deep-foundation/logger` } }, + string: { data: { value: PACKAGE_NAME } }, in: { data: [ { @@ -193,8 +195,8 @@ const main = async () => { // code: `({deep, data: {newLink}}) => { // const timestamp = Date.now(); - // const logObjectTypeId = deep.id("@deep-foundation/logger", "LogObject"); - // const logTypeTypeId = deep.id("@deep-foundation/logger", "LogType"); + // const logObjectTypeId = deep.id("${PACKAGE_NAME}", "LogObject"); + // const logTypeTypeId = deep.id("${PACKAGE_NAME}", "LogType"); // const {data: [{logObjectId}]} = deep.insert({ // type_id: logObjectTypeId, @@ -207,7 +209,7 @@ const main = async () => { // }] // } // }); - // const logInsertTypeId = deep.id("@deep-foundation/logger", "LogInsert"); + // const logInsertTypeId = deep.id("${PACKAGE_NAME}", "LogInsert"); // const {data: [{logInsertId}]} = deep.insert({ // type_id: logInsertTypeId, // number: timestamp @@ -245,7 +247,7 @@ const main = async () => { const timestamp = Date.now(); const logObjectInsertData = { - type_id: deep.id("@deep-foundation/logger", "LogObject"), + type_id: deep.id("${PACKAGE_NAME}", "LogObject"), ...(newLink.from_id && {from_id: newLink.from_id}), ...(newLink.to_id && {to_id: newLink.to_id}), }; @@ -254,13 +256,13 @@ const main = async () => { const {data: [{id: logObjectId}]} = deep.insert(logObjectInsertData); const {data: [{id: logTypeId}]} = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogType"), + type_id: deep.id("${PACKAGE_NAME}", "LogType"), from_id: logObjectId, to_id: newLink.type_id }); const {data: [{id: logInsertId}]} = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogInsert"), + type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), from_id: logObjectId, to_id: newLink.id, string: {data: {value: timestamp}} @@ -287,12 +289,12 @@ const main = async () => { const timestamp = Date.now(); const {data: [{id: logInsertId}]} = deep.select({ - type_id: deep.id("@deep-foundation/logger", "LogInsert"), + type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), to_id: newLink.id }); deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogUpdate"), + type_id: deep.id("${PACKAGE_NAME}", "LogUpdate"), from_id: triggeredByLinkId, to_id: logInsertId, number: timestamp @@ -319,12 +321,12 @@ const main = async () => { const timestamp = Date.now(); const {data: [{id: logInsertId}]} = deep.select({ - type_id: deep.id("@deep-foundation/logger", "LogInsert"), + type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), to_id: oldLink.id }) deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogDelete"), + type_id: deep.id("${PACKAGE_NAME}", "LogDelete"), from_id: triggeredByLinkId, to_id: logInsertId, number: timestamp From c707711cc3c125e2aa51417a8f995dcdd7117ca3 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 07:16:54 +0000 Subject: [PATCH 34/51] Rename LogObject to LogLink --- logger.cjs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logger.cjs b/logger.cjs index 763b568f..16c8c831 100644 --- a/logger.cjs +++ b/logger.cjs @@ -175,7 +175,7 @@ const main = async () => { console.log({ logTypeTypeId }); const { - data: [{ id: logObjectTypeId }], + data: [{ id: logLinkTypeId }], } = await deep.insert({ type_id: typeTypeId, from_id: anyTypeId, @@ -184,11 +184,11 @@ const main = async () => { data: { type_id: containTypeId, from_id: packageId, // before created package - string: { data: { value: 'LogObject' } }, + string: { data: { value: 'LogLink' } }, }, }, }); - console.log({ logObjectTypeId }); + console.log({ logObjectTypeId: logLinkTypeId }); // const insertHandlerId = await insertHandler( // { @@ -383,7 +383,7 @@ const main = async () => { var logObjectId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ - type_id: logObjectTypeId, + type_id: logLinkTypeId, from_id: linkId.from_id, to_id: linkId.to_id }); From eade45bb27ecb6ebb1e551b630ebdc3581855fa5 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 07:17:40 +0000 Subject: [PATCH 35/51] Rename LogObject to LogLink --- logger.cjs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/logger.cjs b/logger.cjs index 16c8c831..726e04df 100644 --- a/logger.cjs +++ b/logger.cjs @@ -188,18 +188,18 @@ const main = async () => { }, }, }); - console.log({ logObjectTypeId: logLinkTypeId }); + console.log({ logLinkTypeId: logLinkTypeId }); // const insertHandlerId = await insertHandler( // { // code: `({deep, data: {newLink}}) => { // const timestamp = Date.now(); - // const logObjectTypeId = deep.id("${PACKAGE_NAME}", "LogObject"); + // const logLinkTypeId = deep.id("${PACKAGE_NAME}", "LogLink"); // const logTypeTypeId = deep.id("${PACKAGE_NAME}", "LogType"); - // const {data: [{logObjectId}]} = deep.insert({ - // type_id: logObjectTypeId, + // const {data: [{logLinkId}]} = deep.insert({ + // type_id: logLinkTypeId, // from_id: newLink.from_id, // to_id: newLink.to_id, // out: { @@ -246,24 +246,24 @@ const main = async () => { code: `({deep, data: {newLink}}) => { const timestamp = Date.now(); - const logObjectInsertData = { - type_id: deep.id("${PACKAGE_NAME}", "LogObject"), + const logLinkInsertData = { + type_id: deep.id("${PACKAGE_NAME}", "LogLink"), ...(newLink.from_id && {from_id: newLink.from_id}), ...(newLink.to_id && {to_id: newLink.to_id}), }; - const {data: [{id: logObjectId}]} = deep.insert(logObjectInsertData); + const {data: [{id: logLinkId}]} = deep.insert(logLinkInsertData); const {data: [{id: logTypeId}]} = deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogType"), - from_id: logObjectId, + from_id: logLinkId, to_id: newLink.type_id }); const {data: [{id: logInsertId}]} = deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), - from_id: logObjectId, + from_id: logLinkId, to_id: newLink.id, string: {data: {value: timestamp}} }); @@ -380,7 +380,7 @@ const main = async () => { console.log({ logInsertId }); expect(logInsertId).to.not.be.equal(undefined); - var logObjectId; + var logLinkId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ type_id: logLinkTypeId, @@ -388,19 +388,19 @@ const main = async () => { to_id: linkId.to_id }); if (data.length > 0) { - logObjectId = data[0].id; + logLinkId = data[0].id; break; } await sleep(1000); } - console.log({ logObjectId }); - expect(logObjectId).to.not.be.equal(undefined); + console.log({ logLinkId }); + expect(logLinkId).to.not.be.equal(undefined); var logTypeId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ type_id: logTypeTypeId, - from_id: logObjectId, + from_id: logLinkId, to_id: /*customTypeId*/ triggerTypeId }); if (data.length > 0) { From 0486ed29d688905ba06da7bc69b28c0fbd49550f Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 07:18:40 +0000 Subject: [PATCH 36/51] Add logSubjectTypeId --- logger.cjs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/logger.cjs b/logger.cjs index 726e04df..0a1330ae 100644 --- a/logger.cjs +++ b/logger.cjs @@ -190,6 +190,22 @@ const main = async () => { }); console.log({ logLinkTypeId: logLinkTypeId }); + const { + data: [{ id: logSubjectTypeId }], + } = await deep.insert({ + type_id: typeTypeId, + from_id: anyTypeId, + to_id: anyTypeId, + in: { + data: { + type_id: containTypeId, + from_id: packageId, // before created package + string: { data: { value: 'LogSubject' } }, + }, + }, + }); + console.log({ logLinkTypeId: logLinkTypeId }); + // const insertHandlerId = await insertHandler( // { // code: `({deep, data: {newLink}}) => { From 70d13c6e095e7dfcfab8a4c4408947986af5f307 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 07:19:19 +0000 Subject: [PATCH 37/51] Rename TypeId -> TypeLinkId --- logger.cjs | 206 ++++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/logger.cjs b/logger.cjs index 0a1330ae..30ccae37 100644 --- a/logger.cjs +++ b/logger.cjs @@ -53,26 +53,26 @@ const main = async () => { '@deep-foundation/core', 'dockerSupportsJs' ); - const handleInsertTypeId = await deep.id('@deep-foundation/core', 'HandleInsert'); - const handleUpdateTypeId = await deep.id('@deep-foundation/core', 'HandleUpdate'); - const handleDeleteTypeId = await deep.id('@deep-foundation/core', 'HandleDelete'); - - const containTypeId = await deep.id('@deep-foundation/core', 'Contain'); - const typeTypeId = await deep.id('@deep-foundation/core', 'Type'); - const packageTypeId = await deep.id('@deep-foundation/core', 'Package'); - const anyTypeId = await deep.id('@deep-foundation/core', 'Any'); - const syncTextFileTypeId = await deep.id('@deep-foundation/core', 'SyncTextFile'); - const joinTypeId = await deep.id('@deep-foundation/core', 'Join'); + const handleInsertTypeLinkId = await deep.id('@deep-foundation/core', 'HandleInsert'); + const handleUpdateTypeLinkId = await deep.id('@deep-foundation/core', 'HandleUpdate'); + const handleDeleteTypeLinkId = await deep.id('@deep-foundation/core', 'HandleDelete'); + + const containTypeLinkId = await deep.id('@deep-foundation/core', 'Contain'); + const typeTypeLinkId = await deep.id('@deep-foundation/core', 'Type'); + const packageTypeLinkId = await deep.id('@deep-foundation/core', 'Package'); + const anyTypeLinkId = await deep.id('@deep-foundation/core', 'Any'); + const syncTextFileTypeLinkId = await deep.id('@deep-foundation/core', 'SyncTextFile'); + const joinTypeLinkId = await deep.id('@deep-foundation/core', 'Join'); const plv8SupportsJsId = await deep.id('@deep-foundation/core', 'plv8SupportsJs'); const { data: [{ id: packageId }] } = await deep.insert({ - type_id: packageTypeId, + type_id: packageTypeLinkId, string: { data: { value: PACKAGE_NAME } }, in: { data: [ { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: deep.linkId }, ] @@ -80,11 +80,11 @@ const main = async () => { out: { data: [ { - type_id: joinTypeId, + type_id: joinTypeLinkId, to_id: await deep.id('deep', 'users', 'packages'), }, { - type_id: joinTypeId, + type_id: joinTypeLinkId, to_id: await deep.id('deep', 'admin'), }, ] @@ -95,165 +95,165 @@ const main = async () => { // Only for development until handlers will handlle "any" as trigger to handle links of all types const { - data: [{ id: triggerTypeId }], + data: [{ id: triggerTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'Trigger' } }, }, }, }); - console.log({ triggerTypeId }); + console.log({ triggerTypeLinkId }); const { - data: [{ id: logInsertTypeId }], + data: [{ id: logInsertTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'LogInsert' } }, }, }, }); - console.log({ logInsertTypeId }); + console.log({ logInsertTypeLinkId }); const { - data: [{ id: logUpdateTypeId }], + data: [{ id: logUpdateTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'LogUpdate' } }, }, }, }); - console.log({ logUpdateTypeId }); + console.log({ logUpdateTypeLinkId }); const { - data: [{ id: logDeleteTypeId }], + data: [{ id: logDeleteTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'LogDelete' } }, }, }, }); - console.log({ logDeleteTypeId }); + console.log({ logDeleteTypeLinkId }); const { - data: [{ id: logTypeTypeId }], + data: [{ id: logTypeTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'LogType' } }, }, }, }); - console.log({ logTypeTypeId }); + console.log({ logTypeTypeLinkId }); const { - data: [{ id: logLinkTypeId }], + data: [{ id: logLinkTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'LogLink' } }, }, }, }); - console.log({ logLinkTypeId: logLinkTypeId }); + console.log({ logLinkTypeLinkId: logLinkTypeLinkId }); const { - data: [{ id: logSubjectTypeId }], + data: [{ id: logSubjectTypeLinkId }], } = await deep.insert({ - type_id: typeTypeId, - from_id: anyTypeId, - to_id: anyTypeId, + type_id: typeTypeLinkId, + from_id: anyTypeLinkId, + to_id: anyTypeLinkId, in: { data: { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: 'LogSubject' } }, }, }, }); - console.log({ logLinkTypeId: logLinkTypeId }); + console.log({ logLinkTypeLinkId: logLinkTypeLinkId }); // const insertHandlerId = await insertHandler( // { // code: `({deep, data: {newLink}}) => { // const timestamp = Date.now(); - // const logLinkTypeId = deep.id("${PACKAGE_NAME}", "LogLink"); - // const logTypeTypeId = deep.id("${PACKAGE_NAME}", "LogType"); + // const logLinkTypeLinkId = deep.id("${PACKAGE_NAME}", "LogLink"); + // const logTypeTypeLinkId = deep.id("${PACKAGE_NAME}", "LogType"); // const {data: [{logLinkId}]} = deep.insert({ - // type_id: logLinkTypeId, + // type_id: logLinkTypeLinkId, // from_id: newLink.from_id, // to_id: newLink.to_id, // out: { // data: [{ - // type_id: logTypeTypeId, + // type_id: logTypeTypeLinkId, // to_id: newLink.type_id // }] // } // }); - // const logInsertTypeId = deep.id("${PACKAGE_NAME}", "LogInsert"); + // const logInsertTypeLinkId = deep.id("${PACKAGE_NAME}", "LogInsert"); // const {data: [{logInsertId}]} = deep.insert({ - // type_id: logInsertTypeId, + // type_id: logInsertTypeLinkId, // number: timestamp // }); // }`, // fileName: "insertHandlerFile", // handlerName: "insertHandler", // handleName: "insertHandle", - // handleOperationTypeId: handleInsertTypeId, + // handleOperationTypeLinkId: handleInsertTypeLinkId, // supportsId: plv8SupportsJsId, - // triggerTypeId: /*TODO: anyTypeId*/ triggerTypeId, - // containTypeId, + // triggerTypeLinkId: /*TODO: anyTypeLinkId*/ triggerTypeLinkId, + // containTypeLinkId, // deep, - // fileTypeId: syncTextFileTypeId, - // handlerTypeId, + // fileTypeLinkId: syncTextFileTypeLinkId, + // handlerTypeLinkId, // packageId // } // ); // console.log({ insertHandlerId }); // await deep.insert({ - // type_id: triggerTypeId + // type_id: triggerTypeLinkId // }) // await sleep(5000); // const {data} =await deep.select({ - // type_id: logInsertTypeId + // type_id: logInsertTypeLinkId // }) // console.log({data}); @@ -271,7 +271,7 @@ const main = async () => { const {data: [{id: logLinkId}]} = deep.insert(logLinkInsertData); - const {data: [{id: logTypeId}]} = deep.insert({ + const {data: [{id: logTypeLinkId}]} = deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogType"), from_id: logLinkId, to_id: newLink.type_id @@ -287,13 +287,13 @@ const main = async () => { fileName: "insertHandlerFile", handlerName: "insertHandler", handleName: "insertHandle", - handleOperationTypeId: handleInsertTypeId, + handleOperationTypeLinkId: handleInsertTypeLinkId, supportsId: plv8SupportsJsId, - triggerTypeId: /*TODO: anyTypeId*/ triggerTypeId, - containTypeId, + triggerTypeLinkId: /*TODO: anyTypeLinkId*/ triggerTypeLinkId, + containTypeLinkId, deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, + fileTypeLinkId: syncTextFileTypeLinkId, + handlerTypeLinkId, packageId } ); @@ -319,13 +319,13 @@ const main = async () => { fileName: "updateHandlerFile", handlerName: "updateHandler", handleName: "updateHandle", - handleOperationTypeId: handleUpdateTypeId, + handleOperationTypeLinkId: handleUpdateTypeLinkId, supportsId: plv8SupportsJsId, - triggerTypeId: /* TODO: anyTypeId */ triggerTypeId, - containTypeId, + triggerTypeLinkId: /* TODO: anyTypeLinkId */ triggerTypeLinkId, + containTypeLinkId, deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, + fileTypeLinkId: syncTextFileTypeLinkId, + handlerTypeLinkId, packageId, } ); @@ -351,13 +351,13 @@ const main = async () => { fileName: "deleteHandlerFile", handlerName: "deleteHandler", handleName: "deleteHandle", - handleOperationTypeId: handleDeleteTypeId, + handleOperationTypeLinkId: handleDeleteTypeLinkId, supportsId: plv8SupportsJsId, - triggerTypeId: /* TODO: anyTypeId */ triggerTypeId, - containTypeId, + triggerTypeLinkId: /* TODO: anyTypeLinkId */ triggerTypeLinkId, + containTypeLinkId, deep, - fileTypeId: syncTextFileTypeId, - handlerTypeId, + fileTypeLinkId: syncTextFileTypeLinkId, + handlerTypeLinkId, packageId } ); @@ -365,17 +365,17 @@ const main = async () => { const createdTestLinkIds = []; const callTests = async () => { - // TODO: const {data: [{id: customTypeId}]} = await deep.Delete({ - // type_id: typeTypeId, - // from_id: anyTypeId, - // to_id: anyTypeId + // TODO: const {data: [{id: customTypeLinkId}]} = await deep.Delete({ + // type_id: typeTypeLinkId, + // from_id: anyTypeLinkId, + // to_id: anyTypeLinkId // }); - // console.log({ customTypeId }); - // createdTestLinkIds.push(customTypeId) - // createdLinkIds.push(customTypeId) + // console.log({ customTypeLinkId }); + // createdTestLinkIds.push(customTypeLinkId) + // createdLinkIds.push(customTypeLinkId) const { data: [{ id: linkId }] } = await deep.insert({ - type_id: /* TODO: customTypeId*/ triggerTypeId, + type_id: /* TODO: customTypeLinkId*/ triggerTypeLinkId, }); console.log({ linkId }); createdTestLinkIds.push(linkId) @@ -384,7 +384,7 @@ const main = async () => { var logInsertId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ - type_id: logInsertTypeId, + type_id: logInsertTypeLinkId, to_id: linkId }); if (data.length > 0) { @@ -399,7 +399,7 @@ const main = async () => { var logLinkId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ - type_id: logLinkTypeId, + type_id: logLinkTypeLinkId, from_id: linkId.from_id, to_id: linkId.to_id }); @@ -412,28 +412,28 @@ const main = async () => { console.log({ logLinkId }); expect(logLinkId).to.not.be.equal(undefined); - var logTypeId; + var logTypeLinkId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ - type_id: logTypeTypeId, + type_id: logTypeTypeLinkId, from_id: logLinkId, - to_id: /*customTypeId*/ triggerTypeId + to_id: /*customTypeLinkId*/ triggerTypeLinkId }); if (data.length > 0) { - logTypeId = data[0].id; + logTypeLinkId = data[0].id; break; } await sleep(1000); } - console.log({ logTypeId }); - expect(logTypeId).to.not.be.equal(undefined); + console.log({ logTypeLinkId }); + expect(logTypeLinkId).to.not.be.equal(undefined); await deep.insert({ link_id: linkId, value: "string" }, { table: "strings" }); var logUpdateId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ - type_id: logUpdateTypeId, + type_id: logUpdateTypeLinkId, from_id: deep.linkId, to_id: logInsertId }); @@ -453,7 +453,7 @@ const main = async () => { var logDeleteId; for (let i = 0; i < 10; i++) { const { data } = await deep.select({ - type_id: logDeleteTypeId, + type_id: logDeleteTypeLinkId, from_id: deep.linkId, to_id: logInsertId }); From 3bac268d264a00414a898cde0d36b6f3ff42a388 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 07:21:29 +0000 Subject: [PATCH 38/51] Make code more readable --- logger.cjs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/logger.cjs b/logger.cjs index 30ccae37..6295dd26 100644 --- a/logger.cjs +++ b/logger.cjs @@ -264,10 +264,13 @@ const main = async () => { const logLinkInsertData = { type_id: deep.id("${PACKAGE_NAME}", "LogLink"), - ...(newLink.from_id && {from_id: newLink.from_id}), - ...(newLink.to_id && {to_id: newLink.to_id}), }; - + if(newLink.from_id) { + logLinkInsertData.from_id = newLink.from_id; + } + if(newLink.to_id) { + logLinkInsertData.to_id = newLink.to_id; + } const {data: [{id: logLinkId}]} = deep.insert(logLinkInsertData); From 3f21766ed2fc1932ad7c8d483d70ff96a6e9a758 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 08:18:18 +0000 Subject: [PATCH 39/51] TypeId -> TypeLinkId --- deep-packages/insertHandler.cjs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/deep-packages/insertHandler.cjs b/deep-packages/insertHandler.cjs index 99f7b278..6570cf31 100644 --- a/deep-packages/insertHandler.cjs +++ b/deep-packages/insertHandler.cjs @@ -1,30 +1,30 @@ -const insertHandler = async ({deep,fileTypeId, fileName, handlerName, handleName, triggerTypeId, code, supportsId, handleOperationTypeId, containTypeId, packageId, handlerTypeId}) => { +const insertHandler = async ({deep,fileTypeLinkId, fileName, handlerName, handleName, triggerTypeLinkId, code, supportsId, handleOperationTypeLinkId, containTypeLinkId, packageId, handlerTypeLinkId}) => { return await deep.insert({ - type_id: fileTypeId, + type_id: fileTypeLinkId, in: { data: [ { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: fileName } }, }, { from_id: supportsId, - type_id: handlerTypeId, + type_id: handlerTypeLinkId, in: { data: [ { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: handlerName } }, }, { - type_id: handleOperationTypeId, - from_id: triggerTypeId, + type_id: handleOperationTypeLinkId, + from_id: triggerTypeLinkId, in: { data: [ { - type_id: containTypeId, + type_id: containTypeLinkId, from_id: packageId, // before created package string: { data: { value: handleName } }, }, From 7266b89e25c793cd399908f525148dd5a63f71e8 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 09:12:01 +0000 Subject: [PATCH 40/51] Add handlerTypeLinkId const --- logger.cjs | 1 + 1 file changed, 1 insertion(+) diff --git a/logger.cjs b/logger.cjs index 6295dd26..7da419af 100644 --- a/logger.cjs +++ b/logger.cjs @@ -53,6 +53,7 @@ const main = async () => { '@deep-foundation/core', 'dockerSupportsJs' ); + const handlerTypeLinkId = await deep.id('@deep-foundation/core', 'Handler'); const handleInsertTypeLinkId = await deep.id('@deep-foundation/core', 'HandleInsert'); const handleUpdateTypeLinkId = await deep.id('@deep-foundation/core', 'HandleUpdate'); const handleDeleteTypeLinkId = await deep.id('@deep-foundation/core', 'HandleDelete'); From 22374b9cec20c49cdec701e657255e489cff371c Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 10 Dec 2022 09:12:24 +0000 Subject: [PATCH 41/51] Change insertHandler --- logger.cjs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/logger.cjs b/logger.cjs index 7da419af..5b0aa998 100644 --- a/logger.cjs +++ b/logger.cjs @@ -260,7 +260,7 @@ const main = async () => { const insertHandlerId = await insertHandler( { - code: `({deep, data: {newLink}}) => { + code: `({deep, data: {newLink, triggeredByLinkId}}) => { const timestamp = Date.now(); const logLinkInsertData = { @@ -281,11 +281,17 @@ const main = async () => { to_id: newLink.type_id }); - const {data: [{id: logInsertId}]} = deep.insert({ + const {data: [{id: logInsertLinkId}]} = deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), from_id: logLinkId, to_id: newLink.id, - string: {data: {value: timestamp}} + number: timestamp + }); + + const {data: [{id: logSubjectId}]} = deep.insert({ + type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logInsertLinkId, }); }`, fileName: "insertHandlerFile", From 7d358ee68afdb69f8a81ebdbb10b3d42bb1c0433 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sun, 11 Dec 2022 08:01:10 +0000 Subject: [PATCH 42/51] Update handlers --- logger.cjs | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/logger.cjs b/logger.cjs index 5b0aa998..86f89422 100644 --- a/logger.cjs +++ b/logger.cjs @@ -288,7 +288,7 @@ const main = async () => { number: timestamp }); - const {data: [{id: logSubjectId}]} = deep.insert({ + const {data: [{id: logSubjectLinkId}]} = deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), from_id: triggeredByLinkId, to_id: logInsertLinkId, @@ -314,17 +314,20 @@ const main = async () => { code: `({deep, data: {newLink, triggeredByLinkId}}) => { const timestamp = Date.now(); - const {data: [{id: logInsertId}]} = deep.select({ - type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), - to_id: newLink.id - }); + /* TODO: const logValueLinkId = LogString|LogNumber|LogObject|LogFile*/ - deep.insert({ + const {data: [{id: logUpdateLinkId}]} = await deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogUpdate"), - from_id: triggeredByLinkId, - to_id: logInsertId, + from_id: logValueLinkId, + to_id: newLink.id, number: timestamp }); + + const {data: [{id: logSubjectLinkId}]} = deep.insert({ + type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logUpdateLinkId, + }); }`, fileName: "updateHandlerFile", handlerName: "updateHandler", @@ -350,13 +353,24 @@ const main = async () => { type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), to_id: oldLink.id }) + + const {data: [{id: logLinkLinkId}]} = deep.select({ + type_id: deep.id("${PACKAGE_NAME}", "LogLink"), + id: logInsertId.from_id + }); - deep.insert({ + const {data: [{id: logDeleteLinkId}]} = deep.insert({ type_id: deep.id("${PACKAGE_NAME}", "LogDelete"), - from_id: triggeredByLinkId, - to_id: logInsertId, + from_id: logLinkLinkId, + to_id: oldLink.id, number: timestamp - }) + }); + + const {data: [{id: logSubjectLinkId}]} = deep.insert({ + type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logDeleteLinkId, + }); }`, fileName: "deleteHandlerFile", handlerName: "deleteHandler", From 0ae8c4cf9e91d2e68c243b5e3fd542464f3f32fb Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Sat, 17 Dec 2022 17:02:35 +0600 Subject: [PATCH 43/51] Update logger --- logger.cjs | 269 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 187 insertions(+), 82 deletions(-) diff --git a/logger.cjs b/logger.cjs index 86f89422..8c9f299e 100644 --- a/logger.cjs +++ b/logger.cjs @@ -3,7 +3,6 @@ require('graphql'); require('lodash'); require('subscriptions-transport-ws'); const dotenv = require('dotenv'); -const dotenvExpand = require('dotenv-expand'); const { generateApolloClient } = require('@deep-foundation/hasura/client'); const { DeepClient } = require('@deep-foundation/deeplinks/imports/client'); const { @@ -20,7 +19,6 @@ const { insertHandler } = require('./deep-packages/insertHandler.cjs'); const { sleep } = require('./deep-packages/sleep.cjs'); var myEnv = dotenv.config(); -dotenvExpand.expand(myEnv); const PACKAGE_NAME = "@deep-foundation/logger"; @@ -33,8 +31,8 @@ const main = async () => { const installPackage = async () => { const apolloClient = generateApolloClient({ - path: process.env.NEXT_PUBLIC_GQL_PATH || '', // <<= HERE PATH TO UPDATE - ssl: !!~process.env.NEXT_PUBLIC_GQL_PATH.indexOf('localhost') + path: "localhost:3006/gql" || '', // <<= HERE PATH TO UPDATE + ssl: !!~"localhost:3006/gql".indexOf('localhost') ? false : true, // admin token in prealpha deep secret key @@ -108,6 +106,11 @@ const main = async () => { string: { data: { value: 'Trigger' } }, }, }, + out: { + data: { + + } + } }); console.log({ triggerTypeLinkId }); @@ -260,40 +263,69 @@ const main = async () => { const insertHandlerId = await insertHandler( { - code: `({deep, data: {newLink, triggeredByLinkId}}) => { - const timestamp = Date.now(); - - const logLinkInsertData = { - type_id: deep.id("${PACKAGE_NAME}", "LogLink"), - }; - if(newLink.from_id) { - logLinkInsertData.from_id = newLink.from_id; - } - if(newLink.to_id) { - logLinkInsertData.to_id = newLink.to_id; - } - - const {data: [{id: logLinkId}]} = deep.insert(logLinkInsertData); - - const {data: [{id: logTypeLinkId}]} = deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogType"), - from_id: logLinkId, - to_id: newLink.type_id - }); - - const {data: [{id: logInsertLinkId}]} = deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), - from_id: logLinkId, - to_id: newLink.id, - number: timestamp - }); - - const {data: [{id: logSubjectLinkId}]} = deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), - from_id: triggeredByLinkId, - to_id: logInsertLinkId, - }); - }`, + code: +` +({ deep, data: { newLink, triggeredByLinkId } }) => { + const timestamp = Date.now(); + + const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); + + const logLinkInsertData = { + type_id: deep.id("@deep-foundation/logger", "LogLink"), + }; + if (newLink.from_id) { + logLinkInsertData.from_id = newLink.from_id; + } + if (newLink.to_id) { + logLinkInsertData.to_id = newLink.to_id; + } + + const { data: [{ id: logLinkId }] } = deep.insert(logLinkInsertData); + + const { data: [{ id: logTypeLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogType"), + from_id: logLinkId, + to_id: newLink.type_id, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }); + + const { data: [{ id: logInsertLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogInsert"), + from_id: logLinkId, + to_id: newLink.id, + number: timestamp, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }); + + deep.insert({ + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + to_id: 1057 + }); + + const { data: [{ id: logSubjectLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logInsertLinkId, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }); +} +`.trim(), fileName: "insertHandlerFile", handlerName: "insertHandler", handleName: "insertHandle", @@ -311,24 +343,73 @@ const main = async () => { const updateHandlerId = await insertHandler( { - code: `({deep, data: {newLink, triggeredByLinkId}}) => { - const timestamp = Date.now(); - - /* TODO: const logValueLinkId = LogString|LogNumber|LogObject|LogFile*/ - - const {data: [{id: logUpdateLinkId}]} = await deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogUpdate"), - from_id: logValueLinkId, - to_id: newLink.id, - number: timestamp - }); - - const {data: [{id: logSubjectLinkId}]} = deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), - from_id: triggeredByLinkId, - to_id: logUpdateLinkId, - }); - }`, + code: +` +({ deep, data: { newLink, triggeredByLinkId } }) => { + + const timestamp = Date.now(); + + + const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); + + const { data: [{ to_id: typeOfValueTypeLinkId }] } = deep.select({ + type_id: deep.id("@deep-foundation/core", "Value"), + from_id: newLink.type_id, + }); + + const typeOfValueString = ( + deep.select({ + type_id: containTypeLinkId, + to_id: typeOfValueTypeLinkId + }) + ).data[0].value.value; + + + + const logValueLinkInsertData = { + type_id: deep.id("@deep-foundation/core", "Value"), + from_id: newLink.type_id, + to_id: deep.id("@deep-foundation/core", typeOfValueString), + + // in: { + // data: { + // type_id: containTypeLinkId, + // from_id: triggeredByLinkId, + // }, + // }, + }; + logValueLinkInsertData[typeOfValueString.toLowerCase()] = { + data: { value: newLink.value.value } + }; + + const { data: [{ id: logValueLinkId }] } = deep.insert(logValueLinkInsertData); + + const { data: [{ id: logUpdateLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogUpdate"), + from_id: logValueLinkId, + to_id: newLink.id, + number: timestamp, + // in: { + // data: { + // type_id: containTypeLinkId, + // from_id: triggeredByLinkId, + // }, + // }, + }); + + const { data: [{ id: logSubjectLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logUpdateLinkId, + // in: { + // data: { + // type_id: containTypeLinkId, + // from_id: triggeredByLinkId, + // }, + // }, + }); +} +`.trim() , fileName: "updateHandlerFile", handlerName: "updateHandler", handleName: "updateHandle", @@ -346,32 +427,56 @@ const main = async () => { const deleteHandlerId = await insertHandler( { - code: `({deep, data: {oldLink, triggeredByLinkId}}) => { - const timestamp = Date.now(); - - const {data: [{id: logInsertId}]} = deep.select({ - type_id: deep.id("${PACKAGE_NAME}", "LogInsert"), - to_id: oldLink.id - }) - - const {data: [{id: logLinkLinkId}]} = deep.select({ - type_id: deep.id("${PACKAGE_NAME}", "LogLink"), - id: logInsertId.from_id - }); - - const {data: [{id: logDeleteLinkId}]} = deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogDelete"), - from_id: logLinkLinkId, - to_id: oldLink.id, - number: timestamp - }); - - const {data: [{id: logSubjectLinkId}]} = deep.insert({ - type_id: deep.id("${PACKAGE_NAME}", "LogSubject"), - from_id: triggeredByLinkId, - to_id: logDeleteLinkId, - }); - }`, + code: +` +({ deep, data: { oldLink, triggeredByLinkId } }) => { + + const timestamp = Date.now(); + + // const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); + + const { data: [{ id: logInsertId }] } = deep.select({ + type_id: deep.id("@deep-foundation/logger", "LogInsert"), + to_id: oldLink.id + }) + + const { data: [{ id: logLinkLinkId }] } = deep.select({ + type_id: deep.id("@deep-foundation/logger", "LogLink"), + id: logInsertId.from_id, + // in: { + // data: { + // type_id: containTypeLinkId, + // from_id: triggeredByLinkId, + // }, + // }, + }); + const { data: [{ id: logDeleteLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogDelete"), + from_id: logLinkLinkId, + to_id: oldLink.id, + number: timestamp, + // in: { + // data: { + // type_id: containTypeLinkId, + // from_id: triggeredByLinkId, + // }, + // }, + }); + + const { data: [{ id: logSubjectLinkId }] } = deep.insert({ + type_id: deep.id("@deep-foundation/logger", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logDeleteLinkId, + // in: { + // data: { + // type_id: containTypeLinkId, + // from_id: triggeredByLinkId, + // }, + // }, + }); +} +`.trim() + , fileName: "deleteHandlerFile", handlerName: "deleteHandler", handleName: "deleteHandle", From 701b5cb0b414b47ef5c5b4fd3502db4bd738d247 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Tue, 20 Dec 2022 14:13:02 +0600 Subject: [PATCH 44/51] Update hanlers --- logger.cjs | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/logger.cjs b/logger.cjs index 8c9f299e..8d9e7031 100644 --- a/logger.cjs +++ b/logger.cjs @@ -18,8 +18,6 @@ const { default: links } = require('@deep-foundation/deeplinks/imports/router/li const { insertHandler } = require('./deep-packages/insertHandler.cjs'); const { sleep } = require('./deep-packages/sleep.cjs'); -var myEnv = dotenv.config(); - const PACKAGE_NAME = "@deep-foundation/logger"; console.log(`Installing ${PACKAGE_NAME} package.`); @@ -433,8 +431,6 @@ const main = async () => { const timestamp = Date.now(); - // const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); - const { data: [{ id: logInsertId }] } = deep.select({ type_id: deep.id("@deep-foundation/logger", "LogInsert"), to_id: oldLink.id @@ -443,36 +439,18 @@ const main = async () => { const { data: [{ id: logLinkLinkId }] } = deep.select({ type_id: deep.id("@deep-foundation/logger", "LogLink"), id: logInsertId.from_id, - // in: { - // data: { - // type_id: containTypeLinkId, - // from_id: triggeredByLinkId, - // }, - // }, }); const { data: [{ id: logDeleteLinkId }] } = deep.insert({ type_id: deep.id("@deep-foundation/logger", "LogDelete"), from_id: logLinkLinkId, to_id: oldLink.id, number: timestamp, - // in: { - // data: { - // type_id: containTypeLinkId, - // from_id: triggeredByLinkId, - // }, - // }, }); const { data: [{ id: logSubjectLinkId }] } = deep.insert({ type_id: deep.id("@deep-foundation/logger", "LogSubject"), from_id: triggeredByLinkId, to_id: logDeleteLinkId, - // in: { - // data: { - // type_id: containTypeLinkId, - // from_id: triggeredByLinkId, - // }, - // }, }); } `.trim() From 4aed4f75c5de02879067764bbfb1b05cc674b496 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Fri, 17 Mar 2023 14:55:23 +0000 Subject: [PATCH 45/51] Update handler --- logger-handler.cjs | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 logger-handler.cjs diff --git a/logger-handler.cjs b/logger-handler.cjs new file mode 100644 index 00000000..52bb1d1a --- /dev/null +++ b/logger-handler.cjs @@ -0,0 +1,66 @@ +({ deep, data: { newLink, triggeredByLinkId } }) => { + const timestamp = Date.now(); + + const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); + + const reservedIds = deep.reserve(25); + + const logLinkInsertData = { + id: reservedIds[0], + type_id: deep.id("@deep-foundation/logger", "LogLink"), + ...(newLink.from_id && {from_id: newLink.from_id}), + ...(newLink.to_id && {from_id: newLink.to_id}), + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }; + + const logInsertLinkInsertData = { + id: reservedIds[1], + type_id: deep.id("@deep-foundation/logger", "LogInsert"), + from_id: logLinkInsertData.id, + to_id: newLink.id, + number: timestamp, // TODO: number field must be of type MutationInsertLink or smth like this, but not number. Issue: https://github.com/deep-foundation/deeplinks/issues/80 + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }; + + const logTypeLinkInsertData = { + type_id: deep.id("@deep-foundation/logger", "LogType"), + from_id: logLinkInsertData.id, + to_id: newLink.type_id, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }; + + const logSubjectLinkInsertData = { + type_id: deep.id("@deep-foundation/logger", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logInsertLinkInsertData.id, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }; + + deep.insert([ + logLinkInsertData, + logInsertLinkInsertData, + logTypeLinkInsertData, + logSubjectLinkInsertData, + logSubjectLinkInsertData + ]) +} \ No newline at end of file From ed731e98d8cb73d81656d7c625c27da1cf8d76e1 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Fri, 17 Mar 2023 14:55:57 +0000 Subject: [PATCH 46/51] Update reserve links count --- logger-handler.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logger-handler.cjs b/logger-handler.cjs index 52bb1d1a..d6043277 100644 --- a/logger-handler.cjs +++ b/logger-handler.cjs @@ -3,7 +3,7 @@ const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); - const reservedIds = deep.reserve(25); + const reservedIds = deep.reserve(2); const logLinkInsertData = { id: reservedIds[0], From 7aa793082e451db2550b739d13ed66262cea3a2c Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Fri, 17 Mar 2023 15:07:30 +0000 Subject: [PATCH 47/51] Rename to insert handler --- logger-handler.cjs => insert-handler.cjs | 0 logger.cjs | 205 +---------------------- 2 files changed, 3 insertions(+), 202 deletions(-) rename logger-handler.cjs => insert-handler.cjs (100%) diff --git a/logger-handler.cjs b/insert-handler.cjs similarity index 100% rename from logger-handler.cjs rename to insert-handler.cjs diff --git a/logger.cjs b/logger.cjs index 8d9e7031..94e144b7 100644 --- a/logger.cjs +++ b/logger.cjs @@ -17,6 +17,7 @@ const { get } = require('lodash'); const { default: links } = require('@deep-foundation/deeplinks/imports/router/links'); const { insertHandler } = require('./deep-packages/insertHandler.cjs'); const { sleep } = require('./deep-packages/sleep.cjs'); +const fs = require('fs'); const PACKAGE_NAME = "@deep-foundation/logger"; @@ -90,28 +91,6 @@ const main = async () => { console.log({ packageId }); - // Only for development until handlers will handlle "any" as trigger to handle links of all types - const { - data: [{ id: triggerTypeLinkId }], - } = await deep.insert({ - type_id: typeTypeLinkId, - from_id: anyTypeLinkId, - to_id: anyTypeLinkId, - in: { - data: { - type_id: containTypeLinkId, - from_id: packageId, // before created package - string: { data: { value: 'Trigger' } }, - }, - }, - out: { - data: { - - } - } - }); - console.log({ triggerTypeLinkId }); - const { data: [{ id: logInsertTypeLinkId }], } = await deep.insert({ @@ -208,122 +187,10 @@ const main = async () => { }); console.log({ logLinkTypeLinkId: logLinkTypeLinkId }); - // const insertHandlerId = await insertHandler( - // { - // code: `({deep, data: {newLink}}) => { - // const timestamp = Date.now(); - - // const logLinkTypeLinkId = deep.id("${PACKAGE_NAME}", "LogLink"); - // const logTypeTypeLinkId = deep.id("${PACKAGE_NAME}", "LogType"); - - // const {data: [{logLinkId}]} = deep.insert({ - // type_id: logLinkTypeLinkId, - // from_id: newLink.from_id, - // to_id: newLink.to_id, - // out: { - // data: [{ - // type_id: logTypeTypeLinkId, - // to_id: newLink.type_id - // }] - // } - // }); - // const logInsertTypeLinkId = deep.id("${PACKAGE_NAME}", "LogInsert"); - // const {data: [{logInsertId}]} = deep.insert({ - // type_id: logInsertTypeLinkId, - // number: timestamp - // }); - // }`, - // fileName: "insertHandlerFile", - // handlerName: "insertHandler", - // handleName: "insertHandle", - // handleOperationTypeLinkId: handleInsertTypeLinkId, - // supportsId: plv8SupportsJsId, - // triggerTypeLinkId: /*TODO: anyTypeLinkId*/ triggerTypeLinkId, - // containTypeLinkId, - // deep, - // fileTypeLinkId: syncTextFileTypeLinkId, - // handlerTypeLinkId, - // packageId - // } - // ); - // console.log({ insertHandlerId }); - - // await deep.insert({ - // type_id: triggerTypeLinkId - // }) - - // await sleep(5000); - - // const {data} =await deep.select({ - // type_id: logInsertTypeLinkId - // }) - // console.log({data}); const insertHandlerId = await insertHandler( { - code: -` -({ deep, data: { newLink, triggeredByLinkId } }) => { - const timestamp = Date.now(); - - const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); - - const logLinkInsertData = { - type_id: deep.id("@deep-foundation/logger", "LogLink"), - }; - if (newLink.from_id) { - logLinkInsertData.from_id = newLink.from_id; - } - if (newLink.to_id) { - logLinkInsertData.to_id = newLink.to_id; - } - - const { data: [{ id: logLinkId }] } = deep.insert(logLinkInsertData); - - const { data: [{ id: logTypeLinkId }] } = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogType"), - from_id: logLinkId, - to_id: newLink.type_id, - in: { - data: { - type_id: containTypeLinkId, - from_id: triggeredByLinkId, - }, - }, - }); - - const { data: [{ id: logInsertLinkId }] } = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogInsert"), - from_id: logLinkId, - to_id: newLink.id, - number: timestamp, - in: { - data: { - type_id: containTypeLinkId, - from_id: triggeredByLinkId, - }, - }, - }); - - deep.insert({ - type_id: containTypeLinkId, - from_id: triggeredByLinkId, - to_id: 1057 - }); - - const { data: [{ id: logSubjectLinkId }] } = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogSubject"), - from_id: triggeredByLinkId, - to_id: logInsertLinkId, - in: { - data: { - type_id: containTypeLinkId, - from_id: triggeredByLinkId, - }, - }, - }); -} -`.trim(), + code: fs.readFileSync('./insert-handler.cjs', {encoding: 'utf-8'}), fileName: "insertHandlerFile", handlerName: "insertHandler", handleName: "insertHandle", @@ -341,73 +208,7 @@ const main = async () => { const updateHandlerId = await insertHandler( { - code: -` -({ deep, data: { newLink, triggeredByLinkId } }) => { - - const timestamp = Date.now(); - - - const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); - - const { data: [{ to_id: typeOfValueTypeLinkId }] } = deep.select({ - type_id: deep.id("@deep-foundation/core", "Value"), - from_id: newLink.type_id, - }); - - const typeOfValueString = ( - deep.select({ - type_id: containTypeLinkId, - to_id: typeOfValueTypeLinkId - }) - ).data[0].value.value; - - - - const logValueLinkInsertData = { - type_id: deep.id("@deep-foundation/core", "Value"), - from_id: newLink.type_id, - to_id: deep.id("@deep-foundation/core", typeOfValueString), - - // in: { - // data: { - // type_id: containTypeLinkId, - // from_id: triggeredByLinkId, - // }, - // }, - }; - logValueLinkInsertData[typeOfValueString.toLowerCase()] = { - data: { value: newLink.value.value } - }; - - const { data: [{ id: logValueLinkId }] } = deep.insert(logValueLinkInsertData); - - const { data: [{ id: logUpdateLinkId }] } = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogUpdate"), - from_id: logValueLinkId, - to_id: newLink.id, - number: timestamp, - // in: { - // data: { - // type_id: containTypeLinkId, - // from_id: triggeredByLinkId, - // }, - // }, - }); - - const { data: [{ id: logSubjectLinkId }] } = deep.insert({ - type_id: deep.id("@deep-foundation/logger", "LogSubject"), - from_id: triggeredByLinkId, - to_id: logUpdateLinkId, - // in: { - // data: { - // type_id: containTypeLinkId, - // from_id: triggeredByLinkId, - // }, - // }, - }); -} -`.trim() , + code: fs.readFileSync('./logger-handler.cjs', {encoding: 'utf-8'}), fileName: "updateHandlerFile", handlerName: "updateHandler", handleName: "updateHandle", From 9eae29033c55c9042e75cfc856b2062d7ebc43ef Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Fri, 17 Mar 2023 15:07:58 +0000 Subject: [PATCH 48/51] Use any type --- logger.cjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logger.cjs b/logger.cjs index 94e144b7..615f5689 100644 --- a/logger.cjs +++ b/logger.cjs @@ -196,7 +196,7 @@ const main = async () => { handleName: "insertHandle", handleOperationTypeLinkId: handleInsertTypeLinkId, supportsId: plv8SupportsJsId, - triggerTypeLinkId: /*TODO: anyTypeLinkId*/ triggerTypeLinkId, + triggerTypeLinkId: anyTypeLinkId , containTypeLinkId, deep, fileTypeLinkId: syncTextFileTypeLinkId, @@ -214,7 +214,7 @@ const main = async () => { handleName: "updateHandle", handleOperationTypeLinkId: handleUpdateTypeLinkId, supportsId: plv8SupportsJsId, - triggerTypeLinkId: /* TODO: anyTypeLinkId */ triggerTypeLinkId, + triggerTypeLinkId: anyTypeLinkId, containTypeLinkId, deep, fileTypeLinkId: syncTextFileTypeLinkId, From ba4cfaa96d4d546ed0a210622969769d63ec32b6 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Fri, 17 Mar 2023 15:29:06 +0000 Subject: [PATCH 49/51] Add update handler --- update-handler.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 update-handler.js diff --git a/update-handler.js b/update-handler.js new file mode 100644 index 00000000..27d0ef41 --- /dev/null +++ b/update-handler.js @@ -0,0 +1,71 @@ +({ deep, data: { newLink, triggeredByLinkId } }) => { + const timestamp = Date.now(); + + const containTypeLinkId = deep.id('@deep-foundation/core', 'Contain'); + + const valueTypeLinkId = deep.id("@deep-foundation/core", "Value"); + const containToValueTypeLinkSelectQuery = { + type_id: containTypeLinkId, + to: { + in: { + type_id: valueTypeLinkId, + from_id: newLink.type_id, + } + } + }; + const { data: [containLinkToValueType] } = deep.select(containToValueTypeLinkSelectQuery); + if(!containLinkToValueType) { + throw new Error(`Query ${JSON.stringify(containToValueTypeLinkSelectQuery)} has not found a link`); + } + const specificValueTypeLinkId = containLinkToValueType.to_id; + + const reservedIds = deep.reserve(3); + + const logValueLinkInsertData = { + id: reservedIds[0], + type_id: deep.id("@deep-foundation/core", "Value"), + from_id: newLink.type_id, + to_id: deep.id("@deep-foundation/core", specificValueTypeLinkId), + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + [containLinkToValueType.value.value]: { + data: { value: newLink.value.value } + } + }; + + const logUpdateInsertData = { + id: reservedIds[1], + type_id: deep.id("@deep-foundation/logger", "LogUpdate"), + from_id: logValueLinkInsertData.id, + to_id: newLink.id, + number: timestamp, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }; + + const logSubjectInsertData = { + type_id: deep.id("@deep-foundation/logger", "LogSubject"), + from_id: triggeredByLinkId, + to_id: logUpdateInsertData.id, + in: { + data: { + type_id: containTypeLinkId, + from_id: triggeredByLinkId, + }, + }, + }; + + await deep.insert([ + logValueLinkInsertData, + logUpdateInsertData, + logSubjectInsertData + ]) +} \ No newline at end of file From 08a8c4586f2eb67a27eced0118b727d85da0f397 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Fri, 17 Mar 2023 15:29:14 +0000 Subject: [PATCH 50/51] Use update handler --- logger.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logger.cjs b/logger.cjs index 615f5689..06d4bda5 100644 --- a/logger.cjs +++ b/logger.cjs @@ -208,7 +208,7 @@ const main = async () => { const updateHandlerId = await insertHandler( { - code: fs.readFileSync('./logger-handler.cjs', {encoding: 'utf-8'}), + code: fs.readFileSync('./update-handler.cjs', {encoding: 'utf-8'}), fileName: "updateHandlerFile", handlerName: "updateHandler", handleName: "updateHandle", From 29fc543f112e266f43671b319c443f935df7eb44 Mon Sep 17 00:00:00 2001 From: FreePhoenix888 Date: Mon, 3 Apr 2023 17:15:51 +0000 Subject: [PATCH 51/51] Update logger --- insert-handler.cjs | 6 +++--- logger.cjs | 38 ++++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/insert-handler.cjs b/insert-handler.cjs index d6043277..e906ad5f 100644 --- a/insert-handler.cjs +++ b/insert-handler.cjs @@ -18,7 +18,7 @@ }, }; - const logInsertLinkInsertData = { + const logInsertInsertData = { id: reservedIds[1], type_id: deep.id("@deep-foundation/logger", "LogInsert"), from_id: logLinkInsertData.id, @@ -47,7 +47,7 @@ const logSubjectLinkInsertData = { type_id: deep.id("@deep-foundation/logger", "LogSubject"), from_id: triggeredByLinkId, - to_id: logInsertLinkInsertData.id, + to_id: logInsertInsertData.id, in: { data: { type_id: containTypeLinkId, @@ -58,7 +58,7 @@ deep.insert([ logLinkInsertData, - logInsertLinkInsertData, + logInsertInsertData, logTypeLinkInsertData, logSubjectLinkInsertData, logSubjectLinkInsertData diff --git a/logger.cjs b/logger.cjs index 06d4bda5..21abbf9e 100644 --- a/logger.cjs +++ b/logger.cjs @@ -62,6 +62,8 @@ const main = async () => { const syncTextFileTypeLinkId = await deep.id('@deep-foundation/core', 'SyncTextFile'); const joinTypeLinkId = await deep.id('@deep-foundation/core', 'Join'); const plv8SupportsJsId = await deep.id('@deep-foundation/core', 'plv8SupportsJs'); + const userTypeLinkId = await deep.id('@deep-foundation/core', 'User'); + const { data: [{ id: packageId }] } = await deep.insert({ @@ -92,7 +94,7 @@ const main = async () => { console.log({ packageId }); const { - data: [{ id: logInsertTypeLinkId }], + data: [{ id: logLinkTypeLinkId }], } = await deep.insert({ type_id: typeTypeLinkId, from_id: anyTypeLinkId, @@ -101,30 +103,30 @@ const main = async () => { data: { type_id: containTypeLinkId, from_id: packageId, // before created package - string: { data: { value: 'LogInsert' } }, + string: { data: { value: 'LogLink' } }, }, }, }); - console.log({ logInsertTypeLinkId }); + console.log({ logLinkTypeLinkId: logLinkTypeLinkId }); const { - data: [{ id: logUpdateTypeLinkId }], + data: [{ id: logInsertTypeLinkId }], } = await deep.insert({ type_id: typeTypeLinkId, - from_id: anyTypeLinkId, + from_id: logLinkTypeLinkId, to_id: anyTypeLinkId, in: { data: { type_id: containTypeLinkId, from_id: packageId, // before created package - string: { data: { value: 'LogUpdate' } }, + string: { data: { value: 'LogInsert' } }, }, }, }); - console.log({ logUpdateTypeLinkId }); + console.log({ logInsertTypeLinkId }); const { - data: [{ id: logDeleteTypeLinkId }], + data: [{ id: logUpdateTypeLinkId }], } = await deep.insert({ type_id: typeTypeLinkId, from_id: anyTypeLinkId, @@ -133,30 +135,30 @@ const main = async () => { data: { type_id: containTypeLinkId, from_id: packageId, // before created package - string: { data: { value: 'LogDelete' } }, + string: { data: { value: 'LogUpdate' } }, }, }, }); - console.log({ logDeleteTypeLinkId }); + console.log({ logUpdateTypeLinkId }); const { - data: [{ id: logTypeTypeLinkId }], + data: [{ id: logDeleteTypeLinkId }], } = await deep.insert({ type_id: typeTypeLinkId, - from_id: anyTypeLinkId, + from_id: logLinkTypeLinkId, to_id: anyTypeLinkId, in: { data: { type_id: containTypeLinkId, from_id: packageId, // before created package - string: { data: { value: 'LogType' } }, + string: { data: { value: 'LogDelete' } }, }, }, }); - console.log({ logTypeTypeLinkId }); + console.log({ logDeleteTypeLinkId }); const { - data: [{ id: logLinkTypeLinkId }], + data: [{ id: logTypeTypeLinkId }], } = await deep.insert({ type_id: typeTypeLinkId, from_id: anyTypeLinkId, @@ -165,17 +167,17 @@ const main = async () => { data: { type_id: containTypeLinkId, from_id: packageId, // before created package - string: { data: { value: 'LogLink' } }, + string: { data: { value: 'LogType' } }, }, }, }); - console.log({ logLinkTypeLinkId: logLinkTypeLinkId }); + console.log({ logTypeTypeLinkId }); const { data: [{ id: logSubjectTypeLinkId }], } = await deep.insert({ type_id: typeTypeLinkId, - from_id: anyTypeLinkId, + from_id: userTypeLinkId, to_id: anyTypeLinkId, in: { data: {